合同管理-去掉审核流程，添加作废功能

jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyAndContactsManagement.java

@@ -21,6 +21,9 @@ public class PayCompanyAndContactsManagement implements Serializable {
 	/**企业名称*/
     @ApiModelProperty(value = "企业名称")
     private String companyName;
+    /**用户名用于会员系统使用*/
+    @ApiModelProperty(value = "用户名用于会员系统使用")
+    private String username;
 	/**公司地址*/
     @ApiModelProperty(value = "公司地址")
     private String companyAddress;

jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java

@@ -49,6 +49,9 @@ public class PayContactsManagement implements Serializable {
 	@Excel(name = "企业名称", width = 15)
     @ApiModelProperty(value = "企业名称")
     private String companyName;
+    /**用户名用于会员系统使用*/
+    @ApiModelProperty(value = "用户名用于会员系统使用")
+    private String username;
 	/**姓名*/
 	@Excel(name = "姓名", width = 15)
     @ApiModelProperty(value = "姓名")

jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java

@@ -200,6 +200,9 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
         updatePayContactsManagement.set(PayContactsManagement::getContactAddress,payContactsManagement.getContactAddress());
         updatePayContactsManagement.set(PayContactsManagement::getPostalCode,payContactsManagement.getPostalCode());
         updatePayContactsManagement.set(PayContactsManagement::getRemarks,payContactsManagement.getRemarks());
+        if(!StringUtils.isBlank(payContactsManagement.getUsername())){
+            updatePayContactsManagement.set(PayContactsManagement::getUsername,payContactsManagement.getUsername());
+        }
         // 变更企业，求改企业联系人为普通联系人
         if(!StringUtils.isBlank(payContactsManagement.getRoleCode())){
             updatePayContactsManagement.set(PayContactsManagement::getRoleCode,payContactsManagement.getRoleCode());

jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java

@@ -387,7 +387,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 	  * @param payIncomeContractAudit 审核记录
 	  */
 	 @AutoLog(value = "收入合同-已作废",operateType = 7)
-	 // @RequiresPermissions("revenueContract:aduit")
+	 @RequiresPermissions("revenueContract:cancellation")
 	 @ApiOperation(value="收入合同-已作废", notes="收入合同-已作废")
 	 @PostMapping(value = "/cancellation")
 	 public Result<?> cancellation(@RequestBody PayIncomeContractAudit payIncomeContractAudit) {

jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java

@@ -184,7 +184,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
 	  * @param paySpendingContractAudit 审核记录
 	  */
 	 @AutoLog(value = "支出合同-已作废",operateType = 7)
-	 // @RequiresPermissions("revenueContract:aduit")
+	 @RequiresPermissions("expenditureContract:cancellation")
 	 @ApiOperation(value="支出合同-已作废", notes="支出合同-已作废")
 	 @PostMapping(value = "/cancellation")
 	 public Result<?> cancellation(@RequestBody PaySpendingContractAudit paySpendingContractAudit) {

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java

@@ -1,7 +1,6 @@
 package com.jero.contract.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -14,7 +13,6 @@ import com.jero.common.enums.CompanyMessageEnums;
 import com.jero.common.enums.ManagementMessageEnums;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.service.SendMessageService;
-import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.PasswordUtil;
 import com.jero.common.util.ValidUtil;
@@ -116,8 +114,6 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
     @Resource
     private IPayMailContractService payMailContractService;
     @Resource
-    private ISysBaseAPI sysBaseAPI;
-    @Resource
     private IPayIncomeContractAssociatedCancellationService payIncomeContractAssociatedCancellationService;
 
     @Override
@@ -772,10 +768,10 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         if(!sysUser.getRoleCode().contains(RoleCommon.CWRY) && !Objects.equals(sysUser.getId(),payIncomeContractNew.getPrincipalId())){
             throw new JeroBootException("数据权限不足！");
         }
-        // 验证合同状态是否为草稿
+//        // 验证合同状态是否为草稿
-        if(!Objects.equals(payIncomeContractNew.getStatus(),PayIncomeContractCommon.STATUS1)){
+//        if(!Objects.equals(payIncomeContractNew.getStatus(),PayIncomeContractCommon.STATUS1)){
-            throw new JeroBootException("收入合同状态不正确！");
+//            throw new JeroBootException("收入合同状态不正确！");
-        }
+//        }
         LambdaUpdateWrapper<PayIncomeContract> updatePayIncomeContract = new LambdaUpdateWrapper<>();
         updatePayIncomeContract.set(PayIncomeContract::getUpdateBy,sysUser.getUsername());
         updatePayIncomeContract.set(PayIncomeContract::getUpdateTime,new Date());
@@ -783,6 +779,10 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         updatePayIncomeContract.set(PayIncomeContract::getStatus,PayIncomeContractCommon.STATUS3);
         payIncomeContractService.update(updatePayIncomeContract);
 
+        // 先删除
+        LambdaUpdateWrapper<PayMailContract> updatePayMailContract = new LambdaUpdateWrapper<>();
+        updatePayMailContract.eq(PayMailContract::getContractId,payIncomeContract.getId());
+        payMailContractService.remove(updatePayMailContract);
         // 更新到合同邮寄表
         PayMailContract payMailContract = new PayMailContract();
         PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(payIncomeContractNew.getSignedContactsTemporaryId());
@@ -794,6 +794,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         payMailContract.setPostStatus(PayIncomeContractCommon.POST_STATUS0);
         payMailContract.setLiaisonMan(payIncomeContractNew.getContractName());
         payMailContractService.save(payMailContract);
+
         // 获取财务人员，发送消息
         List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.CWRY));
         if(!CollectionUtils.isEmpty(list)){
@@ -1032,6 +1033,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                 list.add(payIncomeContractAssociatedCancellation);
                 PayIncomeContractAssociated payIncomeContractAssociated = new PayIncomeContractAssociated();
                 payIncomeContractAssociated.setId(p.getId());
+                payIncomeContractAssociated.setContractId(p.getContractId());
                 cancelAssociated(payIncomeContractAssociated);
             });
             payIncomeContractAssociatedCancellationService.saveBatch(list);
@@ -1129,9 +1131,15 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         if(!sysUser.getRoleCode().contains(RoleCommon.CWRY) && !Objects.equals(sysUser.getId(),payIncomeContractStatus.getPrincipalId())){
             throw new JeroBootException(payIncomeContractStatus.getContractName() + "数据权限不足！");
         }
-        if(!Objects.equals(payIncomeContractStatus.getStatus(),PayIncomeContractCommon.STATUS1)
+        // 取消关联关系
-                && !Objects.equals(payIncomeContractStatus.getStatus(),PayIncomeContractCommon.STATUS6)){
+        List<ProjectOutput> listProject = payIncomeContractService.getAssociated(id);
-            throw new JeroBootException(payIncomeContractStatus.getContractName() + "收入合同不可删除！");
+        if(!CollectionUtils.isEmpty(listProject)){
+            listProject.forEach(p->{
+                PayIncomeContractAssociated payIncomeContractAssociated = new PayIncomeContractAssociated();
+                payIncomeContractAssociated.setId(p.getId());
+                payIncomeContractAssociated.setContractId(p.getContractId());
+                cancelAssociated(payIncomeContractAssociated);
+            });
         }
         payIncomeContractService.removeById(id);
         LambdaUpdateWrapper<PayIncomeContractInstallment> updatePayIncomeContractInstallment = new LambdaUpdateWrapper<>();
@@ -1143,6 +1151,9 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         LambdaUpdateWrapper<PayIncomeContractAudit> updatePayIncomeContractAudit = new LambdaUpdateWrapper<>();
         updatePayIncomeContractAudit.eq(PayIncomeContractAudit::getContractId,id);
         payIncomeContractAuditService.remove(updatePayIncomeContractAudit);
+        LambdaUpdateWrapper<PayMailContract> updatePayMailContract = new LambdaUpdateWrapper<>();
+        updatePayMailContract.eq(PayMailContract::getContractId,id);
+        payMailContractService.remove(updatePayMailContract);
     }
 
     @Override
@@ -1161,10 +1172,6 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
             if(!sysUser.getRoleCode().contains(RoleCommon.CWRY) && !Objects.equals(sysUser.getId(),p.getPrincipalId())){
                 msg.append(p.getContractName() + "数据权限不足！");
             }
-            if(!Objects.equals(p.getStatus(),PayIncomeContractCommon.STATUS1)
-                    && !Objects.equals(p.getStatus(),PayIncomeContractCommon.STATUS4)){
-                msg1.append(p.getContractName() + "收入合同不可删除！");
-            }
         });
         if(!StringUtils.isEmpty(msg)){
             throw new JeroBootException(msg.toString());
@@ -1172,6 +1179,18 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         if(!StringUtils.isEmpty(msg1)){
             throw new JeroBootException(msg1.toString());
         }
+        // 取消关联关系
+        listPayIncomeContractStatus.forEach(p->{
+            List<ProjectOutput> listProject = payIncomeContractService.getAssociated(p.getId());
+            if(!CollectionUtils.isEmpty(listProject)){
+                listProject.forEach(item->{
+                    PayIncomeContractAssociated payIncomeContractAssociated = new PayIncomeContractAssociated();
+                    payIncomeContractAssociated.setId(p.getId());
+                    payIncomeContractAssociated.setContractId(item.getContractId());
+                    cancelAssociated(payIncomeContractAssociated);
+                });
+            }
+        });
         payIncomeContractService.removeByIds(ids);
         LambdaUpdateWrapper<PayIncomeContractInstallment> updatePayIncomeContractInstallment = new LambdaUpdateWrapper<>();
         updatePayIncomeContractInstallment.in(PayIncomeContractInstallment::getContractId,ids);
@@ -1182,6 +1201,9 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         LambdaUpdateWrapper<PayIncomeContractAudit> updatePayIncomeContractAudit = new LambdaUpdateWrapper<>();
         updatePayIncomeContractAudit.in(PayIncomeContractAudit::getContractId,ids);
         payIncomeContractAuditService.remove(updatePayIncomeContractAudit);
+        LambdaUpdateWrapper<PayMailContract> updatePayMailContract = new LambdaUpdateWrapper<>();
+        updatePayMailContract.in(PayMailContract::getContractId,ids);
+        payMailContractService.remove(updatePayMailContract);
     }
 
     @Override