feat: 小程序部署接口新增

src/main/java/com/glxp/api/constant/Constant.java

@@ -26,6 +26,12 @@ public class Constant {
     public static final String TH_ORDER = "TH";     //退货
 
 
+    public static final String DEV_DJH = "DJH";     //设备计划
+    public static final String DEV_DXJ = "DXJ";     //设备巡检任务
+    public static final String DEV_DBX = "DBX";     //设备报修单号
+    public static final String DEV_DWX = "DWX";     //设备维修单号
+
+
     /**
      * 盘点单据前缀
      */

src/main/java/com/glxp/api/constant/FileConstant.java

@@ -0,0 +1,13 @@
+package com.glxp.api.constant;
+
+public class FileConstant {
+
+    public static String CERT_FILE_PATH = "";
+
+    public static String INVOICE_FILE_PATH = "";
+
+    public static String PDF_FILE_PATH = "";
+
+    public static String COMMON_FILE_PATH = "register/image2/";
+
+}

src/main/java/com/glxp/api/controller/auth/DeptUserController.java

@@ -59,6 +59,24 @@ public class DeptUserController {
         return ResultVOUtils.success(deptEntityPageSimpleResponse);
     }
 
+    @AuthRuleAnnotation("")
+    @GetMapping("udi/auth/dept/user/list")
+    public BaseResponse filterListByDeptCode(FilterDeptUserReqeust filterDeptUserReqeust) {
+        //获取部门id
+        String idByCode = filterDeptUserReqeust.getDeptCode();
+        DeptEntity deptEntity = deptService.selectByCode(idByCode);
+        if (deptEntity.getLevel() == 1) {
+            filterDeptUserReqeust.setDeptId(null);
+        } else {
+            filterDeptUserReqeust.setDeptId(deptEntity.getId());
+        }
+        List<DeptUserResponse> deptEntityList = deptUserService.selectJoinDeptUser(filterDeptUserReqeust);
+        PageInfo<DeptUserResponse> pageInfo = new PageInfo<>(deptEntityList);
+        PageSimpleResponse<DeptUserResponse> deptEntityPageSimpleResponse = new PageSimpleResponse<>();
+        deptEntityPageSimpleResponse.setTotal(pageInfo.getTotal());
+        deptEntityPageSimpleResponse.setList(deptEntityList);
+        return ResultVOUtils.success(deptEntityPageSimpleResponse);
+    }
 
     @AuthRuleAnnotation("")
     @PostMapping("udi/auth/dept/user/delete")

src/main/java/com/glxp/api/controller/dev/DeviceAssetCertController.java

@@ -0,0 +1,121 @@
+package com.glxp.api.controller.dev;
+
+import cn.hutool.core.util.IdUtil;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.annotation.Log;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.constant.BusinessType;
+import com.glxp.api.constant.FileConstant;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.dev.DeviceAssetCertEntity;
+import com.glxp.api.req.dev.PostDeviceCertRequest;
+import com.glxp.api.req.inv.FilterInvCertRequest;
+import com.glxp.api.req.system.DeleteDeviceFileRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.auth.CustomerService;
+import com.glxp.api.service.dev.DeviceAssetCertService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.io.File;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.List;
+
+/**
+ * 设备资质证书，技术材料相关
+ */
+@Slf4j
+@RestController
+public class DeviceAssetCertController extends BaseController {
+    @Value("${file_path}")
+    private String filePath;
+    @Resource
+    private DeviceAssetCertService deviceAssetCertService;
+    @Resource
+    private CustomerService customerService;
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/inv/device/cert/filter")
+    public BaseResponse filterDeviceCert(FilterInvCertRequest filterInvCertRequest) {
+        List<DeviceAssetCertEntity> deviceAssetCertEntityList
+                = deviceAssetCertService.filterDeviceCert(filterInvCertRequest);
+        PageInfo<DeviceAssetCertEntity> pageInfo;
+        pageInfo = new PageInfo<>(deviceAssetCertEntityList);
+        PageSimpleResponse<DeviceAssetCertEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(deviceAssetCertEntityList);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/inv/info/insertDeviceCert")
+    @Log(title = "资质证书", businessType = BusinessType.INSERT)
+    public BaseResponse insertDeviceCert(@RequestBody DeviceAssetCertEntity deviceAssetCertEntity) {
+        String userId = customerService.getUserId()+ "";
+        LocalDate now = LocalDate.now();
+        deviceAssetCertEntity.setCreateTime(now);
+        deviceAssetCertEntity.setUpdateTime(now);
+        deviceAssetCertEntity.setCreateUser(userId);
+        deviceAssetCertEntity.setUpdateUser(userId);
+        deviceAssetCertEntity.setStatus(0);
+        deviceAssetCertEntity.setId(IdUtil.getSnowflakeNextId());
+        boolean b = deviceAssetCertService.insertDeviceCert(deviceAssetCertEntity);
+        return ResultVOUtils.success("成功");
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/inv/info/deleteDeviceCert")
+    public BaseResponse deleteDeviceCert(@RequestBody DeleteDeviceFileRequest deleteDeviceFileRequest) {
+        boolean b = deviceAssetCertService.deleteById(deleteDeviceFileRequest.getId());
+        String URL = filePath + FileConstant.COMMON_FILE_PATH + deleteDeviceFileRequest.getFilePath();
+        File file = new File(URL);
+        if (file.exists() && file.isFile()) {
+            file.delete();
+        }
+        return ResultVOUtils.success("成功");
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/inv/info/updateDeviceCert")
+    @Log(title = "资质证书", businessType = BusinessType.UPDATE)
+    public BaseResponse updateDeviceCert(@RequestBody PostDeviceCertRequest postDeviceCertRequest) {
+        DeviceAssetCertEntity deviceAssetCertEntity = new DeviceAssetCertEntity();
+        BeanUtils.copyProperties(postDeviceCertRequest, deviceAssetCertEntity);
+
+        LocalDateTime localDateTime1 = postDeviceCertRequest.getVailDate().atStartOfDay();
+        LocalDateTime localDateTime2= postDeviceCertRequest.getExpireDate().atStartOfDay();
+        Instant instant = localDateTime1.toInstant(ZoneOffset.UTC);
+        Instant instant2 = localDateTime2.toInstant(ZoneOffset.UTC);
+        long milliseconds = instant.toEpochMilli();
+        long milliseconds2 = instant2.toEpochMilli();
+        if (postDeviceCertRequest.getVailDate() != null && postDeviceCertRequest.getExpireDate() != null) {
+            if (milliseconds > milliseconds2) {
+                return ResultVOUtils.error( "生效期不能小于失效期！");
+            }
+        }
+        String userId = customerService.getUserId()+ "";
+        LocalDate now = LocalDate.now();
+        deviceAssetCertEntity.setUpdateTime(now);
+        deviceAssetCertEntity.setUpdateUser(userId);
+        boolean b = deviceAssetCertService.updateDeviceCert(deviceAssetCertEntity);
+        if (b){
+            return ResultVOUtils.success("修改成功");
+        }else {
+            return ResultVOUtils.error("修改失败！");
+        }
+
+    }
+
+
+}

src/main/java/com/glxp/api/controller/dev/DeviceAssetUserController.java

@@ -0,0 +1,91 @@
+package com.glxp.api.controller.dev;
+
+import cn.hutool.core.util.IdUtil;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.annotation.Log;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.constant.BusinessType;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.dev.DeviceAssetUserEntity;
+import com.glxp.api.req.inv.FilterInvUserRequest;
+import com.glxp.api.req.system.DeleteDeviceFileRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.auth.CustomerService;
+import com.glxp.api.service.dev.DeviceAssetUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 设备相关人员
+ */
+@Slf4j
+@RestController
+public class DeviceAssetUserController extends BaseController {
+
+    @Resource
+    private DeviceAssetUserService deviceAssetUserService;
+    @Resource
+    private CustomerService customerService;
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/inv/device/user/filter")
+    public BaseResponse filterDeviceUser(FilterInvUserRequest filterInvUserRequest) {
+        List<DeviceAssetUserEntity> deviceAssetUserEntityList
+                = deviceAssetUserService.filterDeviceUser(filterInvUserRequest);
+        PageInfo<DeviceAssetUserEntity> pageInfo;
+        pageInfo = new PageInfo<>(deviceAssetUserEntityList);
+        PageSimpleResponse<DeviceAssetUserEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(deviceAssetUserEntityList);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/inv/info/insertDeviceUser")
+    @Log(title = "相关人员", businessType = BusinessType.INSERT)
+    public BaseResponse insertDeviceUser(@RequestBody DeviceAssetUserEntity deviceAssetUserEntity) {
+        String userId = customerService.getUserId()+ "";
+        Date now = new Date();
+        deviceAssetUserEntity.setCreateTime(now);
+        deviceAssetUserEntity.setUpdateTime(now);
+        deviceAssetUserEntity.setCreateUser(userId);
+        deviceAssetUserEntity.setUpdateUser(userId);
+        deviceAssetUserEntity.setId(IdUtil.getSnowflakeNextId());
+        boolean b = deviceAssetUserService.insertDeviceUser(deviceAssetUserEntity);
+        return ResultVOUtils.success("成功");
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/inv/info/deleteDeviceUser")
+    public BaseResponse deleteDeviceUser(@RequestBody DeleteDeviceFileRequest deleteDeviceFileRequest) {
+        boolean b = deviceAssetUserService.deleteById(deleteDeviceFileRequest.getId());
+        return ResultVOUtils.success("成功");
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/inv/info/updateDeviceUser")
+    @Log(title = "相关人员", businessType = BusinessType.UPDATE)
+    public BaseResponse updateDeviceUser(@RequestBody DeviceAssetUserEntity deviceAssetUserEntity) {
+        String userId = customerService.getUserId()+ "";
+        Date now = new Date();
+        deviceAssetUserEntity.setUpdateTime(now);
+        deviceAssetUserEntity.setUpdateUser(userId);
+        boolean b = deviceAssetUserService.updateDeviceUser(deviceAssetUserEntity);
+        if (b){
+            return ResultVOUtils.success("修改成功");
+        }else {
+            return ResultVOUtils.error("修改失败！");
+        }
+
+    }
+
+}

src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java

@@ -154,6 +154,24 @@ public class DeviceInfoController extends BaseController {
         return ResultVOUtils.success(page);
     }
 
+    /**
+     * 查看当前用户所在科室设备详情
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/info/detailByUser/one")
+    public BaseResponse detailByUserOne(@RequestBody DeviceInfoDetailQuery query) {
+        List<DeviceInfoVo> list = deviceInfoService.detail(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+
     /**
      * 查看所有科室设备--设备码级别
      *

src/main/java/com/glxp/api/controller/purchase/PurApplyController.java

@@ -12,6 +12,7 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.BusinessType;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.constant.ConstantStatus;
+import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.purchase.PurApplyDetailEntity;
 import com.glxp.api.entity.purchase.PurApplyEntity;
 import com.glxp.api.entity.purchase.PurPlanDetailEntity;
@@ -105,10 +106,16 @@ public class PurApplyController {
     @GetMapping("/purchase/apply/list")
     public BaseResponse list(PurApplyRequest purApplyRequest) {
 
-        if (purApplyRequest.getStatus() == null) {
+        if (purApplyRequest.getIsUser() != null && purApplyRequest.getIsUser()) {
+            AuthAdmin authAdmin = customerService.getUserBean();
+            purApplyRequest.setCreateUser(authAdmin.getId() + ""); //查询自己
+        }else  if (purApplyRequest.getStatus() == null) {
             purApplyRequest.setStatus(11);  //查询未审核和草稿状态
         }
 
+//        Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
+//        purApplyRequest.setSysApprovalFlow(sys_approval_flow);
+
         List<PurApplyResponse> purApplyEntities = purApplyService.queryPageList(purApplyRequest);
         PageInfo<PurApplyResponse> pageInfo;
         pageInfo = new PageInfo<>(purApplyEntities);
@@ -119,6 +126,32 @@ public class PurApplyController {
 
     }
 
+    /**
+     * 查询申购单列表
+     */
+    @PostMapping("/purchase/apply/list")
+    public BaseResponse list2(@RequestBody PurApplyRequest purApplyRequest) {
+
+
+        if (purApplyRequest.getIsUser() != null && purApplyRequest.getIsUser()) {
+            AuthAdmin authAdmin = customerService.getUserBean();
+            purApplyRequest.setCreateUser(authAdmin.getId() + ""); //查询自己
+        }else  if (purApplyRequest.getStatus() == null) {
+            purApplyRequest.setStatus(11);  //查询未审核和草稿状态
+        }
+
+//        Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
+//        purApplyRequest.setSysApprovalFlow(sys_approval_flow);
+
+        List<PurApplyResponse> purApplyEntities = purApplyService.queryPageList(purApplyRequest);
+        PageInfo<PurApplyResponse> pageInfo;
+        pageInfo = new PageInfo<>(purApplyEntities);
+        PageSimpleResponse<PurApplyResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(purApplyEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+
+    }
 
     /**
      * 查询申购单列表
@@ -140,6 +173,33 @@ public class PurApplyController {
 
     }
 
+    /**
+     * 查询申购单列表
+     */
+    @PostMapping("/purchase/apply/auditList")
+    public BaseResponse auditList2(@RequestBody PurApplyRequest purApplyRequest) {
+
+        if (purApplyRequest.getStatus() == null) {
+            purApplyRequest.setStatus(12);  //查询已审核状态
+        }
+//        if (purApplyRequest.getIsInvCode() != null && purApplyRequest.getIsInvCode()) {
+//            AuthAdmin authAdmin = customerService.getUserBean();
+//            purApplyRequest.setTargetInvCode(authAdmin.getLocInvCode() + ""); //查询自己仓库
+//        }
+
+//        Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
+//        purApplyRequest.setSysApprovalFlow(sys_approval_flow);
+
+
+        List<PurApplyResponse> purApplyEntities = purApplyService.queryPageList(purApplyRequest);
+        PageInfo<PurApplyResponse> pageInfo;
+        pageInfo = new PageInfo<>(purApplyEntities);
+        PageSimpleResponse<PurApplyResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(purApplyEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+
+    }
 
     /**
      * 审核申购单

src/main/java/com/glxp/api/controller/purchase/PurContractController.java

@@ -0,0 +1,89 @@
+package com.glxp.api.controller.purchase;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.RepeatSubmit;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.purchase.PurContractDetailEntity;
+import com.glxp.api.entity.purchase.PurContractEntity;
+import com.glxp.api.entity.purchase.PurPlanEntity;
+import com.glxp.api.req.purchase.PostPurContractRequest;
+import com.glxp.api.req.purchase.PurContractDetailRequest;
+import com.glxp.api.req.purchase.PurContractRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.purchase.PurContractEntityResponse;
+import com.glxp.api.service.auth.CustomerService;
+import com.glxp.api.service.purchase.impl.PurContractDetailService;
+import com.glxp.api.service.purchase.impl.PurContractService;
+import com.glxp.api.service.system.SystemParamConfigService;
+import com.glxp.api.util.GennerOrderUtils;
+import com.glxp.api.util.OrderNoTypeBean;
+import jodd.util.StringUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.constraints.NotEmpty;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+@RestController
+@Slf4j
+@RequiredArgsConstructor
+public class PurContractController {
+
+    @Resource
+    PurContractService purContractService;
+    @Resource
+    PurContractDetailService purContractDetailService;
+    @Resource
+    private GennerOrderUtils gennerOrderUtils;
+    @Resource
+    CustomerService customerService;
+    @Resource
+    SystemParamConfigService systemParamConfigService;
+
+    final String type = "cght";
+
+
+
+    /**
+     * 查询采购合同列表
+     */
+    @GetMapping("/purchase/contract/list")
+    public BaseResponse list(PurContractRequest purContractRequest) {
+//
+//        Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
+//        purContractRequest.setSysApprovalFlow(sys_approval_flow);
+
+        List<PurContractEntityResponse> purContractEntityResponses = purContractService.queryPageList(purContractRequest);
+        PageInfo<PurContractEntityResponse> pageInfo;
+        pageInfo = new PageInfo<>(purContractEntityResponses);
+        PageSimpleResponse<PurContractEntityResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(purContractEntityResponses);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    /**
+     * 查询采购合同详情列表
+     *
+     * @param purContractDetailRequest
+     * @return
+     */
+    @GetMapping("/purchase/contract/list/detail")
+    public BaseResponse getDetailList(PurContractDetailRequest purContractDetailRequest) {
+        IPage<PurContractDetailEntity> page = purContractDetailService.queryPageList(purContractDetailRequest);
+        PageSimpleResponse<PurContractDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(page.getTotal());
+        pageSimpleResponse.setList(page.getRecords());
+
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
+
+}

src/main/java/com/glxp/api/dao/dev/DeviceAssetCertMapper.java

@@ -0,0 +1,25 @@
+package com.glxp.api.dao.dev;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.dev.DeviceAssetCertEntity;
+import com.glxp.api.req.inv.FilterInvCertRequest;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceAssetCertMapper extends BaseMapper<DeviceAssetCertEntity> {
+
+    List<DeviceAssetCertEntity> filterCompanyCert(FilterInvCertRequest filterInvCertRequest);
+
+    boolean deleteById(String id);
+
+
+
+    boolean updateDeviceCert(DeviceAssetCertEntity deviceAssetCertEntity);
+
+
+
+
+
+}

src/main/java/com/glxp/api/dao/dev/DeviceAssetUserMapper.java

@@ -0,0 +1,20 @@
+package com.glxp.api.dao.dev;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.dev.DeviceAssetUserEntity;
+import com.glxp.api.req.inv.FilterInvUserRequest;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceAssetUserMapper extends BaseMapper<DeviceAssetUserEntity> {
+
+    List<DeviceAssetUserEntity> filterCompanyUser(FilterInvUserRequest filterInvUserRequest);
+
+    boolean deleteById(String id);
+
+    boolean updateDeviceUser(DeviceAssetUserEntity deviceAssetUserEntity);
+
+
+}

src/main/java/com/glxp/api/dao/purchase/PurContractDetailMapper.java

@@ -0,0 +1,9 @@
+package com.glxp.api.dao.purchase;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.purchase.PurContractDetailEntity;
+
+public interface PurContractDetailMapper extends BaseMapper<PurContractDetailEntity> {
+
+//    int insert(PurContractDetailEntity purContractDetailEntity);
+}

src/main/java/com/glxp/api/dao/purchase/PurContractMapper.java

@@ -0,0 +1,16 @@
+package com.glxp.api.dao.purchase;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.purchase.PurContractEntity;
+import com.glxp.api.req.purchase.PurContractRequest;
+import com.glxp.api.res.purchase.PurContractEntityResponse;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface PurContractMapper extends BaseMapper<PurContractEntity> {
+    @Override
+    int insert(PurContractEntity purContractEntity);
+
+    List<PurContractEntityResponse> selectPage(@Param("purContractRequest") PurContractRequest purContractRequest);
+}

src/main/java/com/glxp/api/entity/dev/DeviceInfoEntity.java

@@ -3,18 +3,20 @@ package com.glxp.api.entity.dev;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.glxp.api.enums.dev.DeviceStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.Date;
-
 /**
  * 设备表
  *
@@ -612,4 +614,20 @@ public class DeviceInfoEntity implements Serializable {
     private String purPlanBillNo;
 
 
+
+
+    public Integer getNumber() {
+        if (this.number == null) {
+            return 0;
+        }
+        return number;
+    }
+
+
+    public BigDecimal getAssetValue() {
+        if (this.assetValue == null) {
+            return BigDecimal.ZERO;
+        }
+        return assetValue;
+    }
 }

src/main/java/com/glxp/api/entity/purchase/PurContractDetailEntity.java

@@ -0,0 +1,155 @@
+package com.glxp.api.entity.purchase;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+    * 单据业务详情表
+    */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "pur_contract_detail")
+public class PurContractDetailEntity implements Serializable {
+    /**
+     * 单据业务ID
+     */
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+
+    /**
+     * 关联合同编号
+     */
+    @TableField(value = "orderIdFk")
+    private String orderIdFk;
+
+    /**
+     * 产品编码
+     */
+    @TableField(value = "productId")
+    private Long productId;
+
+    /**
+     * 产品唯一id uniqueId
+     */
+    @TableField(value = "productUniqueId")
+    private String productUniqueId;
+
+    /**
+     * 最小销售标识
+     */
+    @TableField(value = "nameCode")
+    private String nameCode;
+
+    /**
+     * 批次号
+     */
+    @TableField(value = "batchNo")
+    private String batchNo;
+
+    /**
+     * 产品名称
+     */
+    @TableField(value = "productName")
+    private String productName;
+
+    /**
+     * 生产厂家
+     */
+    @TableField(value = "productCompany")
+    private String productCompany;
+
+    /**
+     * 生产日期
+     */
+    @TableField(value = "produceDate")
+    private Date produceDate;
+
+    /**
+     * 过期时间
+     */
+    @TableField(value = "expireDate")
+    private Date expireDate;
+
+    /**
+     * 注册证/备案号
+     */
+    @TableField(value = "zczbhhzbapzbh")
+    private String zczbhhzbapzbh;
+
+    /**
+     * 规格型号
+     */
+    @TableField(value = "ggxh")
+    private String ggxh;
+
+    /**
+     * 包装级别
+     */
+    @TableField(value = "packRatio")
+    private String packRatio;
+
+    /**
+     * 供应商id
+     */
+    @TableField(value = "supId")
+    private Long supId;
+
+    /**
+     * 供应商名称
+     */
+    @TableField(value = "supName")
+    private String supName;
+
+    /**
+     * 订单该产品实际数量
+     */
+    @TableField(value = "`count`")
+    private Integer count;
+
+    /**
+     * 价格
+     */
+    @TableField(value = "price")
+    private BigDecimal price;
+
+    /**
+     * 销售发票号（第一票）
+     */
+    @TableField(value = "firstSalesInvNo")
+    private String firstSalesInvNo;
+
+    /**
+     * 销售发票号（第二票）
+     */
+    @TableField(value = "secSalesInvNo")
+    private String secSalesInvNo;
+
+    /**
+     * 销售清单号（第二票）
+     */
+    @TableField(value = "secSalesListNo")
+    private String secSalesListNo;
+
+    /**
+     * 开票日期
+     */
+    @TableField(value = "invoiceDate")
+    private String invoiceDate;
+
+    @TableField(value = "remark")
+    private String remark;
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/glxp/api/entity/purchase/PurContractEntity.java

@@ -0,0 +1,170 @@
+package com.glxp.api.entity.purchase;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+    * 采购合同表
+    */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "pur_contract")
+public class PurContractEntity implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+
+    /**
+     * 合同编号
+     */
+    @TableField(value = "code")
+    private String code;
+
+    /**
+     * 合同名称
+     */
+    @TableField(value = "`name`")
+    private String name;
+
+    /**
+     * 往来单位/供应商
+     */
+    @TableField(value = "fromCorp")
+    private String fromCorp;
+
+    /**
+     * 合同签订日期
+     */
+    @TableField(value = "contractDate")
+    private Date contractDate;
+
+    /**
+     * 当前仓库
+     */
+    @TableField(value = "invCode")
+    private String invCode;
+
+    /**
+     * 合同状态
+     */
+    @TableField(value = "`status`")
+    private Integer status;
+
+    /**
+     * 合同类型
+     */
+    @TableField(value = "`type`")
+    private Integer type;
+
+    /**
+     * 付款方式
+     */
+    @TableField(value = "payType")
+    private String payType;
+
+    /**
+     * 开始时间
+     */
+    @TableField(value = "startDate")
+    private Date startDate;
+
+    /**
+     * 截止时间
+     */
+    @TableField(value = "endDate")
+    private Date endDate;
+
+    /**
+     * 合同金额
+     */
+    @TableField(value = "amount")
+    private BigDecimal amount;
+
+    /**
+     * 实付金额
+     */
+    @TableField(value = "payAmount")
+    private BigDecimal payAmount;
+
+    /**
+     * 付款日期
+     */
+    @TableField(value = "payDate")
+    private Date payDate;
+
+    /**
+     * 开票日期
+     */
+    @TableField(value = "invoiceDate")
+    private Date invoiceDate;
+
+    /**
+     * 采购计划ID外键
+     */
+    @TableField(value = "planOrderIdFk")
+    private String planOrderIdFk;
+
+    /**
+     * 采购订单外键
+     */
+    @TableField(value = "orderIdFk")
+    private String orderIdFk;
+
+    /**
+     * 创建人
+     */
+    @TableField(value = "`createUser`")
+    private String createUser;
+
+    /**
+     * 更新人
+     */
+    @TableField(value = "updateUser")
+    private String updateUser;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    private String remark;
+
+    /**
+     * 审批表主键
+     */
+    @TableField(value = "approvalFlowId")
+    private String approvalFlowId;
+
+    /**
+     * 是否生成订单 1.已生成;0.未生成
+     */
+    @TableField(value = "isGenerateOrder")
+    private Integer isGenerateOrder;
+
+    @TableField(value = "pageType")
+    private Integer pageType;
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/glxp/api/req/auth/FilterDeptUserReqeust.java

@@ -7,6 +7,6 @@ import lombok.Data;
 public class FilterDeptUserReqeust extends ListPageRequest {
     private Long deptId;
     private Long userId;
-
+    private String deptCode;
     private String key;
 }

src/main/java/com/glxp/api/req/dev/DeviceRepairApplyAddParam.java

@@ -2,6 +2,7 @@ package com.glxp.api.req.dev;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.glxp.api.constant.Constant;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.dev.DeviceInfoEntity;
 import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity;
@@ -11,7 +12,10 @@ import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum;
 import com.glxp.api.enums.dev.DeviceStatusEnum;
 import com.glxp.api.exception.JsonException;
 import com.glxp.api.service.dev.DeviceInfoService;
+import com.glxp.api.util.GennerOrderUtils;
+import com.glxp.api.util.OrderNoTypeBean;
 import com.glxp.api.util.SnowflakeUtil;
+import com.glxp.api.util.SpringUtils;
 import com.glxp.api.vo.dev.DeviceInfoVo;
 import lombok.Data;
 
@@ -36,6 +40,7 @@ public class DeviceRepairApplyAddParam {
     Set<ApplyDetail> details;
 
     Long taskId;
+    String livePath;
 
     @Data
     public static class ApplyDetail {
@@ -77,9 +82,11 @@ public class DeviceRepairApplyAddParam {
 
 
     public DeviceRepairApplyEntity getEntity(AuthAdmin user) {
+        GennerOrderUtils gennerOrderUtils = SpringUtils.getBean(GennerOrderUtils.class);
         return DeviceRepairApplyEntity
                 .builder()
                 .id(SnowflakeUtil.getId())
+                .repairApplyBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEV_DBX, "yyyyMMdd")))
                 .status(DeviceRepairApplyStatusEnum.WAIT_PROCESS)
                 .applyDeptCode(user.getLocDeptCode())
                 .applyDeptName(user.getDeptName())
@@ -90,6 +97,7 @@ public class DeviceRepairApplyAddParam {
                 .applyTime(LocalDateTime.now())
                 .deviceCount(details.size())
                 .finishCount(0)
+                .livePath(livePath)
                 .updateTime(LocalDateTime.now())
                 .build();
     }

src/main/java/com/glxp/api/req/inv/FilterInvCertRequest.java

@@ -0,0 +1,99 @@
+package com.glxp.api.req.inv;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 查询部门设备明细接口参数
+ */
+@Data
+public class FilterInvCertRequest extends ListPageRequest {
+    /**
+     *
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 设备资产编码外键
+     */
+    @TableField(value = "devCodeFk")
+    private String devCodeFk;
+
+    /**
+     * 证书名称
+     */
+    @TableField(value = "name")
+    private String name;
+
+    /**
+     * 证书编码
+     */
+    @TableField(value = "code")
+    private String code;
+
+    /**
+     * 文件路径
+     */
+    @TableField(value = "filePath")
+    private String filePath;
+
+    /**
+     * 生效期
+     */
+    @TableField(value = "vailDate")
+    private LocalDateTime vailDate;
+
+    /**
+     * 失效期
+     */
+    @TableField(value = "expireDate")
+    private LocalDateTime expireDate;
+
+    /**
+     * 证书状态
+     */
+    @TableField(value = "status")
+    private Integer status;
+
+    /**
+     * 证书类型（1：资质证书；2：技术材料）
+     */
+    @TableField(value = "type")
+    private Integer type;
+
+    /**
+     * 备注说明
+     */
+    @TableField(value = "remark")
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    @TableField(value = "createUser")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新人
+     */
+    @TableField(value = "updateUser")
+    private String updateUser;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    private LocalDateTime updateTime;
+
+}

src/main/java/com/glxp/api/req/inv/FilterInvUserRequest.java

@@ -0,0 +1,74 @@
+package com.glxp.api.req.inv;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 查询部门设备明细接口参数
+ */
+@Data
+public class FilterInvUserRequest extends ListPageRequest {
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+
+    /**
+     * 设备资产编码
+     */
+    @TableField(value = "devCodeFk")
+    private String devCodeFk;
+
+    /**
+     * 相关人员名称
+     */
+    @TableField(value = "userName")
+    private String userName;
+
+    /**
+     * 联系方式1
+     */
+    @TableField(value = "contact1")
+    private String contact1;
+
+    /**
+     * 联系方式2
+     */
+    @TableField(value = "contact2")
+    private String contact2;
+
+    /**
+     * 备注说明
+     */
+    @TableField(value = "remark")
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    @TableField(value = "`createUser`")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @TableField(value = "updateUser")
+    private String updateUser;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    private Date updateTime;
+
+
+}

src/main/java/com/glxp/api/req/purchase/PostPurContractRequest.java

@@ -0,0 +1,14 @@
+package com.glxp.api.req.purchase;
+
+import com.glxp.api.entity.purchase.PurContractDetailEntity;
+import com.glxp.api.entity.purchase.PurContractEntity;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PostPurContractRequest {
+    Integer editStatus;
+    PurContractEntity purContractEntity;
+    List<PurContractDetailEntity> purContractDetailEntities;
+}

src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java

@@ -103,5 +103,18 @@ public class PurApplyRequest extends ListPageRequest {
     private boolean audtoPlan;
 
     private Integer applyType;
+    private Integer emergency;
+    private Date arrivalTime;
+    private String startAuditDate;
+    private String endAuditDate;
+    private String orderBy;
+
+
+    private Boolean isUser;
+    private Boolean isInvCode;
+
+    private Boolean sysApprovalFlow;
+
+    private Integer pageType;
 
 }

src/main/java/com/glxp/api/req/purchase/PurContractDetailRequest.java

@@ -0,0 +1,18 @@
+package com.glxp.api.req.purchase;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class PurContractDetailRequest extends ListPageRequest {
+
+    /**
+     * 合同外键
+     */
+    private String orderIdFk;
+    /**
+     * 合同外键
+     */
+    private String orderItemIdFk;
+
+}

src/main/java/com/glxp/api/req/purchase/PurContractRequest.java

@@ -0,0 +1,46 @@
+package com.glxp.api.req.purchase;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class PurContractRequest extends ListPageRequest {
+
+
+    /**
+     * 合同编号
+     */
+    private String code;
+
+
+    /**
+     * 合同名称
+     */
+    private String name;
+
+    /**
+     * 合同状态
+     */
+    private Integer status;
+
+    /**
+     * 合同签订日期
+     */
+    private String startDate;
+
+    /**
+     * 合同签订日期
+     */
+    private String endDate;
+
+    /**
+     * 是否生成订单 1.已生成;0.未生成
+     */
+    private Integer isGenerateOrder;
+
+    private Boolean sysApprovalFlow;
+
+    @TableField(value = "pageType")
+    private Integer pageType;
+}

src/main/java/com/glxp/api/req/system/DeleteDeviceFileRequest.java

@@ -0,0 +1,11 @@
+package com.glxp.api.req.system;
+
+import lombok.Data;
+
+@Data
+public class DeleteDeviceFileRequest {
+
+    String id;
+    String filePath;
+    String filePath2;
+}

src/main/java/com/glxp/api/res/purchase/PurContractEntityResponse.java

@@ -0,0 +1,180 @@
+package com.glxp.api.res.purchase;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+    * 采购合同表
+    */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class PurContractEntityResponse implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+
+    /**
+     * 合同编号
+     */
+    @TableField(value = "code")
+    private String code;
+
+    /**
+     * 合同名称
+     */
+    @TableField(value = "`name`")
+    private String name;
+
+    /**
+     * 往来单位/供应商
+     */
+    @TableField(value = "fromCorp")
+    private String fromCorp;
+
+    /**
+     * 往来单位/供应商
+     */
+    private String fromCorpName;
+    private String invCodeName;
+
+    /**
+     * 合同签订日期
+     */
+    @TableField(value = "contractDate")
+    private Date contractDate;
+
+    /**
+     * 当前仓库
+     */
+    @TableField(value = "invCode")
+    private String invCode;
+
+    /**
+     * 合同状态
+     */
+    @TableField(value = "`status`")
+    private Integer status;
+
+    /**
+     * 合同类型
+     */
+    @TableField(value = "`type`")
+    private Integer type;
+
+    /**
+     * 付款方式
+     */
+    @TableField(value = "payType")
+    private String payType;
+
+    /**
+     * 开始时间
+     */
+    @TableField(value = "startDate")
+    private Date startDate;
+
+    /**
+     * 截止时间
+     */
+    @TableField(value = "endDate")
+    private Date endDate;
+
+    /**
+     * 合同金额
+     */
+    @TableField(value = "amount")
+    private BigDecimal amount;
+
+    /**
+     * 实付金额
+     */
+    @TableField(value = "payAmount")
+    private BigDecimal payAmount;
+
+    /**
+     * 付款日期
+     */
+    @TableField(value = "payDate")
+    private Date payDate;
+
+    /**
+     * 开票日期
+     */
+    @TableField(value = "invoiceDate")
+    private Date invoiceDate;
+
+    /**
+     * 采购计划ID外键
+     */
+    @TableField(value = "planOrderIdFk")
+    private String planOrderIdFk;
+
+    /**
+     * 采购订单外键
+     */
+    @TableField(value = "orderIdFk")
+    private String orderIdFk;
+
+    /**
+     * 创建人
+     */
+    @TableField(value = "`createUser`")
+    private String createUser;
+
+    /**
+     * 更新人
+     */
+    @TableField(value = "updateUser")
+    private String updateUser;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    private String remark;
+
+    /**
+     * 审批表主键
+     */
+    @TableField(value = "approvalFlowId")
+    private String approvalFlowId;
+
+    private String nextNodeName;
+
+    private  Integer nextApprovalNodeType;
+    /**
+     * 是否生成订单 1.已生成;0.未生成
+     */
+    @TableField(value = "isGenerateOrder")
+    private Integer isGenerateOrder;
+
+    /**
+     * 合同状态
+     */
+    @TableField(value = "`flowStatus`")
+    private Integer flowStatus;
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/glxp/api/service/dev/DeviceAssetCertService.java

@@ -0,0 +1,34 @@
+package com.glxp.api.service.dev;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.glxp.api.entity.dev.DeviceAssetCertEntity;
+import com.glxp.api.req.inv.FilterInvCertRequest;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public interface DeviceAssetCertService extends IService<DeviceAssetCertEntity> {
+    List<DeviceAssetCertEntity> filterDeviceCert(FilterInvCertRequest filterInvCertRequest);
+
+    boolean insertDeviceCert(DeviceAssetCertEntity deviceAssetCertEntity);
+
+    boolean deleteById(String id);
+
+    boolean updateDeviceCert(DeviceAssetCertEntity deviceAssetCertEntity);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

src/main/java/com/glxp/api/service/dev/DeviceAssetUserService.java

@@ -0,0 +1,22 @@
+package com.glxp.api.service.dev;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.glxp.api.entity.dev.DeviceAssetUserEntity;
+import com.glxp.api.req.inv.FilterInvUserRequest;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public interface DeviceAssetUserService extends IService<DeviceAssetUserEntity> {
+
+    List<DeviceAssetUserEntity> filterDeviceUser(FilterInvUserRequest filterInvUserRequest);
+
+    boolean insertDeviceUser(DeviceAssetUserEntity deviceAssetUserEntity);
+
+    boolean deleteById(String id);
+
+    boolean updateDeviceUser(DeviceAssetUserEntity deviceAssetUserEntity);
+
+
+}

src/main/java/com/glxp/api/service/dev/impl/DeviceAssetCertServiceImpl.java

@@ -0,0 +1,54 @@
+package com.glxp.api.service.dev.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.dao.dev.DeviceAssetCertMapper;
+import com.glxp.api.entity.dev.DeviceAssetCertEntity;
+import com.glxp.api.req.inv.FilterInvCertRequest;
+import com.glxp.api.service.dev.DeviceAssetCertService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+@Slf4j
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class DeviceAssetCertServiceImpl extends ServiceImpl<DeviceAssetCertMapper, DeviceAssetCertEntity> implements DeviceAssetCertService {
+    @Resource
+    DeviceAssetCertMapper deviceAssetCertMapper;
+
+
+    @Override
+    public List<DeviceAssetCertEntity> filterDeviceCert(FilterInvCertRequest filterInvCertRequest) {
+        if (filterInvCertRequest == null) {
+            return Collections.emptyList();
+        }
+        if (filterInvCertRequest.getPage() != null) {
+            int offset = (filterInvCertRequest.getPage() - 1) * filterInvCertRequest.getLimit();
+            PageHelper.offsetPage(offset, filterInvCertRequest.getLimit());
+        }
+        return deviceAssetCertMapper.filterCompanyCert(filterInvCertRequest);
+    }
+    @Override
+    public boolean insertDeviceCert(DeviceAssetCertEntity deviceAssetCertEntity) {
+        return deviceAssetCertMapper.insert(deviceAssetCertEntity) > 0 ? true : false;
+    }
+
+    @Override
+    public boolean deleteById(String id) {
+        return deviceAssetCertMapper.deleteById(id);
+    }
+
+    @Override
+    public boolean updateDeviceCert(DeviceAssetCertEntity deviceAssetCertEntity) {
+        return deviceAssetCertMapper.updateDeviceCert(deviceAssetCertEntity);
+    }
+
+
+
+}

src/main/java/com/glxp/api/service/dev/impl/DeviceAssetUserServiceImpl.java

@@ -0,0 +1,54 @@
+package com.glxp.api.service.dev.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.dao.dev.DeviceAssetUserMapper;
+import com.glxp.api.entity.dev.DeviceAssetUserEntity;
+import com.glxp.api.req.inv.FilterInvUserRequest;
+import com.glxp.api.service.dev.DeviceAssetUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+@Slf4j
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class DeviceAssetUserServiceImpl extends ServiceImpl<DeviceAssetUserMapper, DeviceAssetUserEntity> implements DeviceAssetUserService {
+    @Resource
+    DeviceAssetUserMapper deviceAssetUserMapper;
+
+
+    @Override
+    public List<DeviceAssetUserEntity> filterDeviceUser(FilterInvUserRequest filterInvUserRequest) {
+        if (filterInvUserRequest == null) {
+            return Collections.emptyList();
+        }
+        if (filterInvUserRequest.getPage() != null) {
+            int offset = (filterInvUserRequest.getPage() - 1) * filterInvUserRequest.getLimit();
+            PageHelper.offsetPage(offset, filterInvUserRequest.getLimit());
+        }
+        return deviceAssetUserMapper.filterCompanyUser(filterInvUserRequest);
+    }
+    @Override
+    public boolean insertDeviceUser(DeviceAssetUserEntity deviceAssetUserEntity) {
+        return deviceAssetUserMapper.insert(deviceAssetUserEntity) > 0 ? true : false;
+    }
+
+    @Override
+    public boolean deleteById(String id) {
+        return deviceAssetUserMapper.deleteById(id);
+    }
+
+    @Override
+    public boolean updateDeviceUser(DeviceAssetUserEntity deviceAssetUserEntity) {
+        return deviceAssetUserMapper.updateDeviceUser(deviceAssetUserEntity);
+    }
+
+
+
+}

src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyDetailServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
+import com.glxp.api.constant.Constant;
 import com.glxp.api.dao.dev.DeviceRepairApplyDetailMapper;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.dev.DeviceCheckDetailEntity;
@@ -20,6 +21,8 @@ import com.glxp.api.req.dev.DeviceRepairApplyDetailQuery;
 import com.glxp.api.req.dev.DeviceRepairApplyListByIdAndCodeQuery;
 import com.glxp.api.res.dev.DeviceRepairApplyDetailMiniResponse;
 import com.glxp.api.service.dev.*;
+import com.glxp.api.util.GennerOrderUtils;
+import com.glxp.api.util.OrderNoTypeBean;
 import com.glxp.api.util.SnowflakeUtil;
 import groovy.util.logging.Slf4j;
 import lombok.RequiredArgsConstructor;
@@ -52,6 +55,9 @@ public class DeviceRepairApplyDetailServiceImpl extends ServiceImpl<DeviceRepair
     @Lazy
     DeviceRepairService deviceRepairService;
     final DeviceInfoService deviceInfoService;
+    @Autowired
+    @Lazy
+    GennerOrderUtils gennerOrderUtils;
 
     @Override
     public List<DeviceRepairApplyDetailEntity> pageList(DeviceRepairApplyDetailQuery query) {
@@ -96,9 +102,10 @@ public class DeviceRepairApplyDetailServiceImpl extends ServiceImpl<DeviceRepair
                     .setCreateTime(now).setDiagnosisInfo(param.getDiagnosisInfo()).setInnerFlag(param.getInnerFlag())
                     .setRepairUserName(param.getRepairUserName())
                     .setRepairUserId(param.getRepairUserId())
-                    .setRepairUserPhone(param.getRepairUserPhone()).
+                    .setRepairUserPhone(param.getRepairUserPhone())
-                    setRepairDeptCode(param.getRepairDeptCode())
+                    .setRepairDeptCode(param.getRepairDeptCode())
                     .setDiagnosisLivePath(param.getDiagnosisLivePath())
+                    .setRepairBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEV_DWX, "yyyyMMdd")))
             ;
             deviceRepairService.createRepair(repairEntity);
         }

src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyServiceImpl.java

@@ -125,6 +125,7 @@ public class DeviceRepairApplyServiceImpl extends ServiceImpl<DeviceRepairApplyM
             if (taskId != null){
                 deviceCheckDetailService.update(Wrappers.lambdaUpdate(DeviceCheckDetailEntity.class)
                         .set(DeviceCheckDetailEntity::getApplyId, repairApply.getId())
+                        .set(DeviceCheckDetailEntity::getUpdateTime,LocalDateTime.now())
                         .eq(DeviceCheckDetailEntity::getTaskId, taskId)
                         .eq(DeviceCheckDetailEntity::getDeviceCode, d.getDeviceCode())
                 );

src/main/java/com/glxp/api/service/purchase/impl/PurContractDetailService.java

@@ -0,0 +1,63 @@
+package com.glxp.api.service.purchase.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.glxp.api.dao.basic.UdiRlSupDao;
+import com.glxp.api.dao.purchase.PurContractDetailMapper;
+import com.glxp.api.entity.purchase.PurContractDetailEntity;
+import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
+import com.glxp.api.req.purchase.PurContractDetailRequest;
+import com.glxp.api.res.basic.UdiRlSupResponse;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.List;
+
+@Service
+public class PurContractDetailService extends ServiceImpl<PurContractDetailMapper, PurContractDetailEntity> {
+
+    @Resource
+    PurContractDetailMapper purContractDetailMapper;
+    @Resource
+    UdiRlSupDao udiRlSupDao;
+
+
+    public IPage<PurContractDetailEntity> queryPageList(PurContractDetailRequest purContractDetailRequest) {
+        QueryWrapper<PurContractDetailEntity> wrapper = buildPurContractDetailQueryWrapper(purContractDetailRequest);
+        IPage<PurContractDetailEntity> page = new Page<>(purContractDetailRequest.getPage(), purContractDetailRequest.getLimit());
+        return purContractDetailMapper.selectPage(page, wrapper);
+    }
+
+    /**
+     * 构造查询条件
+     *
+     * @param purContractDetailRequest
+     * @return
+     */
+    private QueryWrapper<PurContractDetailEntity> buildPurContractDetailQueryWrapper(PurContractDetailRequest purContractDetailRequest) {
+        QueryWrapper<PurContractDetailEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StrUtil.isNotBlank(purContractDetailRequest.getOrderIdFk()), "orderIdFk", purContractDetailRequest.getOrderIdFk())
+                .orderByDesc("id");
+        return wrapper;
+    }
+
+    public int deleteByOrderId(Long id) {
+        UpdateWrapper<PurContractDetailEntity> uw = new UpdateWrapper<>();
+        uw.eq("orderIdFk",id);
+        return purContractDetailMapper.delete(uw);
+    }
+
+    public int deleteByIds(List<Long> asList) {
+        UpdateWrapper<PurContractDetailEntity> uw = new UpdateWrapper<>();
+        uw.in("id",asList);
+        return purContractDetailMapper.delete(uw);
+    }
+}

src/main/java/com/glxp/api/service/purchase/impl/PurContractService.java

@@ -0,0 +1,46 @@
+package com.glxp.api.service.purchase.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.dao.purchase.PurContractDetailMapper;
+import com.glxp.api.dao.purchase.PurContractMapper;
+import com.glxp.api.dao.purchase.PurPlanDao;
+import com.glxp.api.entity.purchase.PurContractDetailEntity;
+import com.glxp.api.entity.purchase.PurContractEntity;
+import com.glxp.api.entity.purchase.PurPlanEntity;
+import com.glxp.api.req.purchase.PurContractRequest;
+import com.glxp.api.req.purchase.PurPlanDetailRequest;
+import com.glxp.api.res.purchase.PurContractEntityResponse;
+import com.glxp.api.res.purchase.PurOrderDetailResponse;
+import com.glxp.api.service.auth.CustomerService;
+import com.glxp.api.service.purchase.PurPlanDetailService;
+import com.glxp.api.util.GennerOrderUtils;
+import com.glxp.api.util.OrderNoTypeBean;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class PurContractService extends ServiceImpl<PurContractMapper, PurContractEntity> {
+
+    @Resource
+    PurContractMapper purContractMapper;
+
+    public List<PurContractEntityResponse> queryPageList(PurContractRequest purContractRequest) {
+        if (purContractRequest == null) {
+            return Collections.emptyList();
+        }
+        if (purContractRequest.getPage() != null) {
+            int offset = (purContractRequest.getPage() - 1) * purContractRequest.getLimit();
+            PageHelper.offsetPage(offset, purContractRequest.getLimit());
+        }
+        List<PurContractEntityResponse> data = purContractMapper.selectPage(purContractRequest);
+        return data;
+    }
+
+}

src/main/resources/mybatis/mapper/dev/DeviceAssetCertMapper.xml

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.api.dao.dev.DeviceAssetCertMapper">
+  <resultMap id="BaseResultMap" type="com.glxp.api.entity.dev.DeviceAssetCertEntity">
+    <!--@mbg.generated-->
+    <!--@Table device_asset_cert-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="devCodeFk" jdbcType="VARCHAR" property="devCodeFk" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="filePath" jdbcType="LONGVARCHAR" property="filePath" />
+    <result column="vailDate" jdbcType="TIMESTAMP" property="vailDate" />
+    <result column="expireDate" jdbcType="TIMESTAMP" property="expireDate" />
+    <result column="status" jdbcType="TINYINT" property="status" />
+    <result column="type" jdbcType="TINYINT" property="type" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="createUser" jdbcType="VARCHAR" property="createUser" />
+    <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="updateUser" jdbcType="VARCHAR" property="updateUser" />
+    <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, devCodeFk, `name`, code, filePath, vailDate, expireDate, `status`, `type`, remark,
+    `createUser`, createTime, updateUser, updateTime
+  </sql>
+
+  <select id="filterCompanyCert" parameterType="com.glxp.api.req.inv.FilterInvCertRequest"
+          resultType="com.glxp.api.entity.dev.DeviceAssetCertEntity">
+    select * from device_asset_cert
+    <where>
+      devCodeFk = #{devCodeFk}
+<!--      <if test="devCodeFk != '' and devCodeFk!=null">-->
+<!--        and devCodeFk = #{devCodeFk}-->
+<!--      </if>-->
+      <if test="name != '' and name!=null">
+        and name = #{name}
+      </if>
+      <if test="code != '' and code!=null">
+        and code = #{code}
+      </if>
+      <if test="status != '' and status!=null">
+        and status = #{status}
+      </if>
+      <if test="type != '' and type!=null">
+        and `type` = #{type}
+      </if>
+
+
+    </where>
+    ORDER BY id DESC
+  </select>
+
+  <delete id="deleteById" parameterType="Map">
+    DELETE
+    FROM device_asset_cert
+    WHERE id = #{id}
+  </delete>
+
+  <update id="updateDeviceCert" parameterType="com.glxp.api.entity.dev.DeviceAssetCertEntity">
+    UPDATE device_asset_cert
+    <trim prefix="set" suffixOverrides=",">
+      <if test="name != null">name=#{name},</if>
+      <if test="devCodeFk != null">devCodeFk=#{devCodeFk},</if>
+      <if test="filePath != null">filePath=#{filePath},</if>
+      <if test="remark != null">remark=#{remark},</if>
+      vailDate=#{vailDate},
+      expireDate=#{expireDate},
+      <if test="type != null">`type`=#{type},</if>
+      <if test="code != null">`code`=#{code},</if>
+      <if test="status != null">`status`=#{status},</if>
+      <if test="updateUser != null">`updateUser`=#{updateUser},</if>
+      <if test="updateTime != null">`updateTime`=#{updateTime},</if>
+
+    </trim>
+    WHERE id = #{id}
+  </update>
+
+
+
+</mapper>

src/main/resources/mybatis/mapper/dev/DeviceAssetUserMapper.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.api.dao.dev.DeviceAssetUserMapper">
+  <resultMap id="BaseResultMap" type="com.glxp.api.entity.dev.DeviceAssetUserEntity">
+    <!--@mbg.generated-->
+    <!--@Table device_asset_user-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="devCodeFk" jdbcType="VARCHAR" property="devCodeFk" />
+    <result column="userName" jdbcType="VARCHAR" property="userName" />
+    <result column="contact1" jdbcType="VARCHAR" property="contact1" />
+    <result column="contact2" jdbcType="VARCHAR" property="contact2" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="createUser" jdbcType="VARCHAR" property="createUser" />
+    <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="updateUser" jdbcType="VARCHAR" property="updateUser" />
+    <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, devCodeFk, userName, contact1, contact2, remark, `createUser`, createTime, updateUser,
+    updateTime
+  </sql>
+
+
+  <select id="filterCompanyUser" parameterType="com.glxp.api.req.inv.FilterInvUserRequest"
+          resultType="com.glxp.api.entity.dev.DeviceAssetUserEntity">
+    select * from device_asset_user
+    <where>
+      devCodeFk = #{devCodeFk}
+      <!--      <if test="devCodeFk != '' and devCodeFk!=null">-->
+      <!--        and devCodeFk = #{devCodeFk}-->
+      <!--      </if>-->
+      <if test="userName != '' and userName!=null">
+        and userName = #{userName}
+      </if>
+      <if test="contact1 != '' and contact1!=null">
+        and contact1 = #{contact1}
+      </if>
+      <if test="contact2 != '' and contact2!=null">
+        and contact2 = #{contact2}
+      </if>
+
+    </where>
+    ORDER BY id DESC
+  </select>
+
+  <delete id="deleteById" parameterType="Map">
+    DELETE
+    FROM device_asset_user
+    WHERE id = #{id}
+  </delete>
+
+  <update id="updateDeviceUser" parameterType="com.glxp.api.entity.dev.DeviceAssetUserEntity">
+    UPDATE device_asset_user
+    <trim prefix="set" suffixOverrides=",">
+      <if test="userName != null">userName=#{userName},</if>
+      <if test="devCodeFk != null">devCodeFk=#{devCodeFk},</if>
+      <if test="contact1 != null">contact1=#{contact1},</if>
+      <if test="contact2 != null">contact2=#{contact2},</if>
+      <if test="remark != null">`remark`=#{remark},</if>
+      <if test="updateUser != null">`updateUser`=#{updateUser},</if>
+      <if test="updateTime != null">`updateTime`=#{updateTime},</if>
+
+    </trim>
+    WHERE id = #{id}
+  </update>
+
+
+
+</mapper>

src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml

@@ -5,57 +5,116 @@
 
     <select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurApplyRequest"
             resultType="com.glxp.api.res.purchase.PurApplyResponse">
-        SELECT
+        SELECT IFNULL(saf.status,1) as flowStatus,saf.updateTime as flowAuditTime,saf.updateUserName as flowAuditByName,
         pur_apply.*,
-        cb.employeeName createByName,
+        cb.employeeName       createByName,
-        ab.employeeName auditByName,
+        ab.employeeName       auditByName,
         auth_warehouse.`name` targetInvName,
-        auth_dept.`name` targetDeptName
+        auth_dept.`name`      targetDeptName,
-        FROM
+        aw1.`name`            invName,
-        pur_apply
+        ad1.`name`            deptName
+        FROM pur_apply
         LEFT JOIN auth_user cb ON pur_apply.createUser = cb.id
         LEFT JOIN auth_user ab ON pur_apply.auditUser = ab.id
         LEFT JOIN auth_warehouse ON pur_apply.targetInvCode = auth_warehouse.`code`
         LEFT JOIN auth_dept ON auth_dept.`code` = pur_apply.targetDeptCode
+        LEFT JOIN auth_warehouse aw1 ON pur_apply.invCode = aw1.`code`
+        LEFT JOIN auth_dept ad1 ON ad1.`code` = pur_apply.deptCode
+        Left Join sys_approval_flow as saf ON pur_apply.approvalFlowId = saf.id
         <where>
             <if test="billNo != '' and billNo != null">
                 AND billNo = #{billNo}
             </if>
-            <if test="startDate != null and startDate !=''">
+            <if test="startDate != null and startDate != ''">
-                <![CDATA[ and DATE_FORMAT(billDate,'%Y-%m-%d')>= #{startDate}]]>
+                <![CDATA[
+                and DATE_FORMAT(pur_apply.createTime, '%Y-%m-%d') >= #{startDate}
+                ]]>
             </if>
-            <if test="endDate != null and endDate !=''">
+            <if test="endDate != null and endDate != ''">
-                <![CDATA[ and DATE_FORMAT(billDate,'%Y-%m-%d') <= #{endDate}]]>
+                <![CDATA[
+                and DATE_FORMAT(pur_apply.createTime, '%Y-%m-%d') <= #{endDate}
+                ]]>
             </if>
-            <if test="status!=null and status!=10 and status!=11">
+            <if test="startAuditDate != null and startAuditDate != ''">
-                and pur_apply.status = #{status}
+                <![CDATA[
+                and DATE_FORMAT(pur_apply.auditTime, '%Y-%m-%d') >= #{startAuditDate}
+                ]]>
             </if>
-            <if test="status ==10">
+            <if test="endAuditDate != null and endAuditDate != ''">
-                and ( pur_apply.status = 3 or pur_apply.status=2 or pur_apply.status=4)
+                <![CDATA[
+                and DATE_FORMAT(pur_apply.auditTime, '%Y-%m-%d') <= #{endAuditDate}
+                ]]>
             </if>
-            <if test="status ==11">
+
-                and ( pur_apply.status = 1 or pur_apply.status=2 or pur_apply.status=4)
+            <if test="!sysApprovalFlow">
+                <if test="status != null and status != 10 and status != 11 and status != 12 ">
+                    and pur_apply.status = #{status}
+                </if>
+                <if test="status == 10">
+                    and (pur_apply.status = 2 )
+                </if>
+                <if test="status == 11">
+                    and (pur_apply.status = 1 or pur_apply.status = 2 or pur_apply.status = 4)
+                </if>
+                <if test="status == 12">
+                    and (pur_apply.status = 3)
+                </if>
+            </if>
+
+            <if test="sysApprovalFlow">
+                <if test="status != null and status != 10 and status != 11 and status != 12 ">
+                    and saf.status = #{status}
+                </if>
+                <if test="status == 10">
+                    and (saf.status = 2)
+                </if>
+                <if test="status == 11">
+                    and (saf.status = 1 or saf.status = 2 or saf.status = 4 or saf.status is null)
+                </if>
+                <if test="status == 12">
+                    and (saf.status = 3)
+                </if>
             </if>
 
             <if test="deptCode != '' and deptCode != null">
-                AND deptCode = #{deptCode}
+                AND pur_apply.deptCode = #{deptCode}
             </if>
             <if test="invCode != '' and invCode != null">
-                AND invCode = #{invCode}
+                AND pur_apply.invCode = #{invCode}
+            </if>
+            <if test="targetInvCode != '' and targetInvCode != null">
+                AND  pur_apply.targetInvCode = #{targetInvCode}
+            </if>
+            <if test="targetDeptCode != '' and targetDeptCode != null">
+                AND  pur_apply.targetDeptCode = #{targetDeptCode}
             </if>
             <if test="auditUser != '' and auditUser != null">
-                AND auditUser = #{auditUser}
+                AND  pur_apply.auditUser = #{auditUser}
             </if>
             <if test="createUser != '' and createUser != null">
-                AND createUser = #{createUser}
+                AND pur_apply.createUser = #{createUser}
             </if>
             <if test="applyType != null">
-                AND generatePlan = 1
+                AND  pur_apply.generatePlan = 1
+            </if>
+            <if test="emergency != null">
+                AND  pur_apply.emergency = #{emergency}
+            </if>
+            <if test="pageType != null">
+                AND  pur_apply.pageType = #{pageType}
             </if>
         </where>
-
+        <choose>
+            <when test="(orderBy != null) and (sort == 'desc' or sort == 'asc')">
+                order by ${orderBy} ${sort}
+            </when>
+            <otherwise>
+                ORDER BY updateTime DESC
+            </otherwise>
+        </choose>
     </select>
 
+
     <insert id="insert" keyProperty="id" keyColumn="id"
             parameterType="com.glxp.api.entity.purchase.PurApplyEntity" useGeneratedKeys="true">
         replace
@@ -126,4 +185,4 @@
         WHERE id = #{id}
     </update>
 
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/purchase/PurContractDetailMapper.xml

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.api.dao.purchase.PurContractDetailMapper">
+  <resultMap id="BaseResultMap" type="com.glxp.api.entity.purchase.PurContractDetailEntity">
+    <!--@mbg.generated-->
+    <!--@Table pur_contract_detail-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="orderIdFk" jdbcType="VARCHAR" property="orderidfk" />
+    <result column="productId" jdbcType="BIGINT" property="productid" />
+    <result column="productUniqueId" jdbcType="VARCHAR" property="productuniqueid" />
+    <result column="nameCode" jdbcType="VARCHAR" property="namecode" />
+    <result column="batchNo" jdbcType="VARCHAR" property="batchno" />
+    <result column="productName" jdbcType="VARCHAR" property="productname" />
+    <result column="productCompany" jdbcType="VARCHAR" property="productcompany" />
+    <result column="produceDate" jdbcType="DATE" property="producedate" />
+    <result column="expireDate" jdbcType="DATE" property="expiredate" />
+    <result column="zczbhhzbapzbh" jdbcType="VARCHAR" property="zczbhhzbapzbh" />
+    <result column="ggxh" jdbcType="VARCHAR" property="ggxh" />
+    <result column="packRatio" jdbcType="VARCHAR" property="packratio" />
+    <result column="supId" jdbcType="BIGINT" property="supid" />
+    <result column="supName" jdbcType="VARCHAR" property="supname" />
+    <result column="count" jdbcType="INTEGER" property="count" />
+    <result column="price" jdbcType="DECIMAL" property="price" />
+    <result column="firstSalesInvNo" jdbcType="VARCHAR" property="firstsalesinvno" />
+    <result column="secSalesInvNo" jdbcType="VARCHAR" property="secsalesinvno" />
+    <result column="secSalesListNo" jdbcType="VARCHAR" property="secsaleslistno" />
+    <result column="invoiceDate" jdbcType="VARCHAR" property="invoicedate" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, orderIdFk, productId, productUniqueId, nameCode, batchNo, productName, productCompany,
+    produceDate, expireDate, zczbhhzbapzbh, ggxh, packRatio, supId, supName, `count`,
+    price, firstSalesInvNo, secSalesInvNo, secSalesListNo, invoiceDate, remark
+  </sql>
+
+  <insert id="insert" keyProperty="id"
+          parameterType="com.glxp.api.entity.purchase.PurContractDetailEntity">
+    replace
+    INTO  pur_contract_detail
+    (
+    orderIdFk,
+    productId,
+    productUniqueId,
+    nameCode,
+    batchNo,
+    productName,
+    productCompany,
+    produceDate,
+    expireDate,
+    zczbhhzbapzbh,
+    ggxh,
+    packRatio,
+    supId,
+    supName,
+    `count`,
+    price,
+    firstSalesInvNo,
+    secSalesInvNo,
+    secSalesListNo,
+    invoiceDate,
+    remark
+    )
+    values (
+    #{orderIdFk},
+    #{productId},
+    #{productUniqueId},
+    #{nameCode},
+    #{batchNo},
+    #{productName},
+    #{productCompany},
+    #{produceDate},
+    #{expireDate},
+    #{zczbhhzbapzbh},
+    #{ggxh},
+    #{packRatio},
+    #{supId},
+    #{supName},
+    #{count},
+    #{price},
+    #{firstSalesInvNo},
+    #{secSalesInvNo},
+    #{secSalesListNo},
+    #{invoiceDate},
+    #{remark}
+    )
+  </insert>
+</mapper>

src/main/resources/mybatis/mapper/purchase/PurContractMapper.xml

@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.api.dao.purchase.PurContractMapper">
+  <resultMap id="BaseResultMap" type="com.glxp.api.entity.purchase.PurContractEntity">
+    <!--@mbg.generated-->
+    <!--@Table pur_contract-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="fromCorp" jdbcType="VARCHAR" property="fromCorp" />
+    <result column="contractDate" jdbcType="TIMESTAMP" property="contractDate" />
+    <result column="invCode" jdbcType="VARCHAR" property="invCode" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="payType" jdbcType="INTEGER" property="payType" />
+    <result column="startDate" jdbcType="TIMESTAMP" property="startDate" />
+    <result column="endDate" jdbcType="TIMESTAMP" property="endDate" />
+    <result column="amount" jdbcType="DECIMAL" property="amount" />
+    <result column="payAmount" jdbcType="DECIMAL" property="payAmount" />
+    <result column="payDate" jdbcType="TIMESTAMP" property="payDate" />
+    <result column="invoiceDate" jdbcType="TIMESTAMP" property="invoiceDate" />
+    <result column="planOrderIdFk" jdbcType="VARCHAR" property="planOrderIdFk" />
+    <result column="orderIdFk" jdbcType="VARCHAR" property="orderIdFk" />
+    <result column="createUser" jdbcType="VARCHAR" property="createUser" />
+    <result column="updateUser" jdbcType="VARCHAR" property="updateUser" />
+    <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, code, `name`, fromCorp, contractDate, invCode, `status`, `type`, payType, startDate,
+    endDate, amount, payAmount, payDate, invoiceDate, planOrderIdFk, orderIdFk, `createUser`,
+    updateUser, createTime, updateTime, remark
+  </sql>
+
+  <insert id="insert" keyProperty="id"
+          parameterType="com.glxp.api.entity.purchase.PurPlanEntity" useGeneratedKeys="true">
+    insert
+    INTO  pur_contract
+    (
+    code,
+    `name`,
+    fromCorp,
+    contractDate,
+    invCode,
+    `status`,
+    `type`,
+    payType,
+    startDate,
+    endDate,
+    amount,
+    payAmount,
+    payDate,
+    invoiceDate,
+    planOrderIdFk,
+    orderIdFk,
+    `createUser`,
+    updateUser,
+    createTime,
+    updateTime,
+    remark
+    )
+    values (
+    #{code},
+    #{name},
+    #{fromCorp},
+    #{contractDate},
+    #{invCode},
+    #{status},
+    #{type},
+    #{payType},
+    #{startDate},
+    #{endDate},
+    #{amount},
+    #{payAmount},
+    #{payDate},
+    #{invoiceDate},
+    #{planOrderIdFk},
+    #{orderIdFk},
+    #{createUser},
+    #{updateUser},
+    #{createTime},
+    #{updateTime},
+    #{remark}
+    )
+  </insert>
+
+
+
+  <select id="selectPage" parameterType="com.glxp.api.req.purchase.PurContractRequest"
+          resultType="com.glxp.api.res.purchase.PurContractEntityResponse">
+    select
+    pc.id, pc.code, pc.`name`, pc.fromCorp, pc.contractDate, pc.invCode, pc.`type`, pc.payType, pc.startDate,
+    pc.endDate, pc.amount, pc.payAmount, pc.payDate, pc.invoiceDate, pc.planOrderIdFk, pc.orderIdFk, pc.`createUser`,
+    pc.updateUser, pc.createTime, pc.updateTime, pc.remark,pc.approvalFlowId,pc.isGenerateOrder,IFNULL(pc.status,0) as status,
+    saf.status as flowStatus, saf.nextNodeName as nextNodeName , saf.nextApprovalNodeType as nextApprovalNodeType,bc.name as fromCorpName,aw.name AS invCodeName
+    from pur_contract pc
+    left join basic_corp bc on pc.fromCorp = bc.erpId
+    left join auth_warehouse aw on pc.invCode = aw.code
+    left join sys_approval_flow saf ON pc.approvalFlowId = saf.id
+    <where>
+      pc.code is not null
+      <if test="!purContractRequest.sysApprovalFlow">
+        <if test="purContractRequest.status != null and purContractRequest.status != 10 and purContractRequest.status != 11 and purContractRequest.status != 12 ">
+          and pc.status = #{purContractRequest.status}
+        </if>
+        <if test="purContractRequest.status == 10">
+          and (pc.status = 2 )
+        </if>
+        <if test="purContractRequest.status == 11">
+          and (pc.status = 1 or pc.status is null )
+        </if>
+        <if test="purContractRequest.status == 12">
+          and (pc.status = 3 or pc.status = 4)
+        </if>
+      </if>
+
+      <if test="purContractRequest.sysApprovalFlow">
+        <if test="purContractRequest.status != null and purContractRequest.status != 10 and purContractRequest.status != 11 and purContractRequest.status != 12 ">
+          and saf.status = #{purContractRequest.status}
+        </if>
+        <if test="purContractRequest.status == 10">
+          and (saf.status = 2)
+        </if>
+        <if test="purContractRequest.status == 11">
+          and (saf.status = 1 or  saf.status is null)
+        </if>
+        <if test="purContractRequest.status == 12">
+          and (saf.status = 3 or saf.status = 4)
+        </if>
+      </if>
+
+      <if test="purContractRequest.code != null and purContractRequest.code != ''" >
+        and pc.code like concat('%',#{purContractRequest.code},'%')
+      </if>
+      <if test="purContractRequest.name != null and purContractRequest.name != ''" >
+        and pc.name like concat('%',#{purContractRequest.name},'%')
+      </if>
+      <if test="purContractRequest.isGenerateOrder != null " >
+        and pc.isGenerateOrder = #{purContractRequest.isGenerateOrder}
+      </if>
+      <if test="purContractRequest.startDate != null and purContractRequest.startDate != ''">
+        AND pc.contractDate <![CDATA[>=]]> #{purContractRequest.startDate}
+      </if>
+      <if test="purContractRequest.endDate != null and purContractRequest.endDate != ''">
+        AND pc.contractDate <![CDATA[<=]]> #{purContractRequest.endDate}
+      </if>
+      <if test="purContractRequest.pageType != null ">
+        AND pc.pageType =  #{purContractRequest.pageType}
+      </if>
+      order by  id desc
+    </where>
+
+  </select>
+</mapper>