Merge remote-tracking branch 'origin/master'

dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/CompanyAppletRequest.java

@@ -21,6 +21,9 @@ import java.util.List;
 @ToString
 public class CompanyAppletRequest implements Serializable {
 
+    @ApiModelProperty(value = "客户编号")
+    private String code;
+
     @NotNull(message = "客户名称不能为空")
     @ApiModelProperty(value = "客户名称")
     private String name;

dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/PersonalAppletRequest.java

@@ -23,6 +23,9 @@ public class PersonalAppletRequest implements Serializable {
     @ApiModelProperty("客户表id")
     private Long companyId;
 
+    @ApiModelProperty(value = "客户编号")
+    private String code;
+
     @NotNull(message = "客户名称不能为空")
     @ApiModelProperty(value = "客户名称")
     private String name;

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java

@@ -374,6 +374,20 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     paymentConfirmationConsiderCWB.setAuditOpinion("");
                     insert = paymentConfirmationConsiderMapper.updateById(paymentConfirmationConsiderCWB);
                 }
+
+                //法规部数据存在，更新法规部经理财务回款数据
+                QueryWrapper<DgPaymentConfirmationConsider> paymentConfirmationConsiderFG = new QueryWrapper<>();
+                paymentConfirmationConsiderFG.eq("business_id",businessId).eq("role_id",PromptSuccess.FG_JL_ID);
+                DgPaymentConfirmationConsider paymentConfirmationConsiderFg = paymentConfirmationConsiderMapper.selectOne(paymentConfirmationConsiderFG);
+                //数据存在，进行更新
+                if (ObjectUtil.isNotNull(paymentConfirmationConsiderFg)){
+                    paymentConfirmationConsiderFg.setStatus(StatusCode.SP_IN_REVIEW);
+                    paymentConfirmationConsiderFg.setOperatingStatus(StatusCode.CZ_PROCESSED);
+                    //清空上次的审批意见及银行回单
+                    paymentConfirmationConsiderFg.setAuditOpinion("");
+                    paymentConfirmationConsiderFg.setImgFile("");
+                    paymentConfirmationConsiderMapper.updateById(paymentConfirmationConsiderFg);
+                }
                 //更新成功，返回操作结果
                 log.info(insert > 0 ? "资产部经理成功添加回款数据" : "资产部经理添加回款数据失败");
                 return insert > 0;