feat: 设备管理优化-0514-合同管理

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

@@ -1,15 +1,13 @@
 package com.glxp.api.controller.purchase;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+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.AddPurPlanDetailRequest;
-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.req.purchase.*;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.purchase.PurContractEntityResponse;
 import com.glxp.api.service.auth.CustomerService;
@@ -70,7 +68,9 @@ public class PurContractController {
             String code = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean("HT", "yyyyMMdd"));
             purContractEntity.setCode(code);
         }
-       if (editStatus == 2){//提交审核
+
+        Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
+        if (editStatus == 2 && sys_approval_flow){//提交审核
             String approvalFlowId = sysApprovalFlowService.getApprovalFlowId();
             purContractEntity.setApprovalFlowId(approvalFlowId);
             sysApprovalFlowService.generateFlow(approvalFlowId,purContractEntity.getCode(),type);
@@ -204,4 +204,20 @@ public class PurContractController {
         return ResultVOUtils.success();
     }
 
+
+    /**
+     * 审核采购合同
+     */
+    @RepeatSubmit()
+    @PostMapping("/purchase/contract/auditOrder")
+    public BaseResponse auditOrder(@RequestBody PurContractRequest purContractRequest) {
+        String code = purContractRequest.getCode();
+        Integer status = purContractRequest.getStatus();
+        if (StringUtil.isEmpty(code) || status == null){
+            return ResultVOUtils.error(999, "参数有误！");
+        }
+        boolean b = purContractService.auditOrder(purContractRequest);
+        return ResultVOUtils.success("更新成功！");
+    }
+
 }

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

@@ -164,5 +164,11 @@ public class PurContractEntityResponse implements Serializable {
     @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/purchase/impl/PurContractService.java

@@ -2,6 +2,7 @@ package com.glxp.api.service.purchase.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -113,4 +114,14 @@ public class PurContractService extends ServiceImpl<PurContractMapper, PurContra
         purPlanEntity.setImportStatus(1);
         purPlanDao.updateById(purPlanEntity);
     }
+
+    public boolean auditOrder(PurContractRequest purContractRequest) {
+        Long userId = customerService.getUserId();
+        String code = purContractRequest.getCode();
+        PurContractEntity one = super.getOne(new LambdaQueryWrapper<>(PurContractEntity.class).eq(PurContractEntity::getCode, code));
+        one.setUpdateTime(new Date());
+        one.setUpdateUser(userId + "");
+        one.setStatus(purContractRequest.getStatus());
+        return super.updateById(one);
+    }
 }

src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml

@@ -118,6 +118,9 @@
             <if test="subordinateCode != '' and subordinateCode != null">
                 AND auth_dept.pcode = #{subordinateCode}
             </if>
+            <if test="code != '' and code != null">
+                AND auth_warehouse.code = #{code}
+            </if>
         </where>
         group by auth_warehouse.id
     </select>

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

@@ -93,8 +93,8 @@
     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(saf.status,0) as status, saf.nextNodeName as nextNodeName , saf.nextApprovalNodeType as nextApprovalNodeType
+    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
     from pur_contract pc
     left join sys_approval_flow saf ON pc.approvalFlowId = saf.id
     <where>