his客户闭户信息；预算申请异常修复；协议类关联信息

src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java

@@ -16,6 +16,7 @@ import com.qs.serve.modules.tbs.entity.TbsCostApply;
 import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo;
 import com.qs.serve.modules.tbs.service.impl.TbsBudgetApplyOperationServiceImpl;
 import com.qs.serve.modules.tbs.service.impl.TbsBudgetBatchOperationServiceImpl;
+import com.qs.serve.modules.tbs.service.impl.TbsBudgetChangeOperationServiceImpl;
 import com.qs.serve.modules.tbs.service.impl.TbsCostApplyOperationServiceImpl;
 import com.qs.serve.modules.tzc.service.impl.TzcPolicyOperationServiceImpl;
 import com.qs.serve.modules.vtb.common.VtbVerificationState;
@@ -92,9 +93,9 @@ public class AsyncFactory {
             public void run() {
                 try {
                     AuthContextUtils.setTenant("001");
-                    log.debug("--------------------------SubmitBudgetApply CallbackTimer Sleep Start------------------------------");
+                    log.debug("--------------------------SubmitBudgetApply CallbackTimer Sleep Start :{}------------------------------",budgetId);
                     Thread.sleep(7*1000);
-                    TbsBudgetApplyOperationServiceImpl applyOperationService = SpringUtils.getBean(TbsBudgetApplyOperationServiceImpl.class);
+                    TbsBudgetChangeOperationServiceImpl applyOperationService = SpringUtils.getBean(TbsBudgetChangeOperationServiceImpl.class);
 
                     String summeryResult = applyOperationService.checkAffairSummery(budgetId);
                     if(summeryResult.equals(SeeYonOperationService.SummeryState_Success)){
@@ -173,7 +174,7 @@ public class AsyncFactory {
             public void run() {
                 try {
                     AuthContextUtils.setTenant("001");
-                    log.debug("--------------------------SubmitBudgetApply CallbackTimer Sleep Start------------------------------");
+                    log.debug("--------------------------submitBudgetApply CallbackTimer Sleep Start :{}------------------------------",budgetId);
                     Thread.sleep(7*1000);
                     TbsBudgetApplyOperationServiceImpl applyOperationService = SpringUtils.getBean(TbsBudgetApplyOperationServiceImpl.class);
                     String summeryResult = applyOperationService.checkAffairSummery(budgetId);

src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java

@@ -385,6 +385,10 @@ public class BmsSupplier implements Serializable {
         userSupplier.setSupplierFlag(this.getSupplierFlag());
         userSupplier.setType(type);
         userSupplier.setCostFlag(this.costFlag);
+        userSupplier.setStopFlag(this.stopFlag);
+        userSupplier.setStopFlagDate(this.stopFlagDate);
+        userSupplier.setCooperatePauseFlag(this.cooperatePauseFlag);
+        userSupplier.setCooperatePauseFlagDate(this.getCooperatePauseFlagDate());
         return userSupplier;
     }
 

src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java

@@ -108,6 +108,24 @@ public class HisUserSupplier implements Serializable {
     /** 是否供应商 */
     private Integer supplierFlag;
 
+
+    /** 闭户 */
+    private Integer stopFlag;
+
+    /** 闭户日期 */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime stopFlagDate;
+
+    /** 暂不合作 */
+    private Integer cooperatePauseFlag;
+
+    /** 暂不合作日期 */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime cooperatePauseFlagDate;
+
+
     @TableField(exist = false)
     private String queryAddress;
 

src/main/java/com/qs/serve/modules/his/entity/HisUserSupplierTemp.java

@@ -108,6 +108,21 @@ public class HisUserSupplierTemp implements Serializable {
     /**  */
     private Integer costFlag;
 
+    /** 闭户 */
+    private Integer stopFlag;
+
+    /** 闭户日期 */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime stopFlagDate;
+
+    /** 暂不合作 */
+    private Integer cooperatePauseFlag;
+
+    /** 暂不合作日期 */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime cooperatePauseFlagDate;
 
 	public static HisUserSupplierTemp toNewObject(HisUserSupplierTemp source){
 		HisUserSupplierTemp userSupplierTemp = new HisUserSupplierTemp();

src/main/java/com/qs/serve/modules/tbs/controller/TbsCostContractController.java

@@ -121,6 +121,8 @@ public class TbsCostContractController {
         contract.setAttachIds(param.getAttachIds());
         contract.setSignTime(param.getSignTime());
         contract.setExpireTime(param.getExpireTime());
+        contract.setBusinessCompany(param.getBusinessCompany());
+        contract.setDutyNumber(param.getDutyNumber());
         boolean result = tbsCostContractService.updateById(contract);
         return R.isTrue(result);
     }
@@ -153,6 +155,8 @@ public class TbsCostContractController {
             contract.setSealId(param.getSealId());
             contract.setSealNum(param.getSealNum());
             contract.setFileNum(param.getFileNum());
+            contract.setBusinessCompany(param.getBusinessCompany());
+            contract.setDutyNumber(param.getDutyNumber());
         }
         if(contract.getId()==null){
             tbsCostContractService.save(contract);

src/main/java/com/qs/serve/modules/tbs/entity/TbsCostContract.java

@@ -67,6 +67,12 @@ public class TbsCostContract implements Serializable {
     @Length(max = 255,message = "备注长度不能超过255字")
     private String remark;
 
+    /** 业务所属公司 */
+    private String businessCompany;
+
+    /** 税号 */
+    private String dutyNumber;
+
     /** 创建时间 */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")

src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java

@@ -59,6 +59,8 @@ public class TbsAffairCommitBo {
      */
     private List<AffairSubjectLine> affairSubjectLines;
 
+
+
     @Data
     public static class AffairSubjectLine{
 

src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostContractBo.java

@@ -40,6 +40,12 @@ public class TbsCostContractBo implements Serializable {
     /** 合同条件(文本框) */
     private String contractCondition;
 
+    /** 业务所属公司 */
+    private String businessCompany;
+
+    /** 税号 */
+    private String dutyNumber;
+
     /** 合同附件地址 */
     private String[] attachIds;
 

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java

@@ -82,8 +82,7 @@ public class TbsBudgetApplyOperationServiceImpl implements SeeYonOperationServic
             //启用预算
             tbsBudget.setBudgetState(1);
             budgetMapper.updateById(tbsBudget);
-
-            SysUser sysUser = getSysUserService().getById(AuthContextUtils.getSysUserId());
+            SysUser sysUser = getSysUserService().getById(tbsBudget.getUserId());
             LambdaQueryWrapper<TbsScheduleItemBudget> lqw = new LambdaQueryWrapper<>();
             lqw.eq(TbsScheduleItemBudget::getBudgetId,param.getTargetId());
             List<TbsScheduleItemBudget> scheduleItemBudgets = scheduleItemBudgetService.list(lqw);

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@@ -601,6 +601,9 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
             data.put("costCenterNo",concatCenterCodes);
             data.put("costCenterName",concatCenterNames);
 
+            data.put("businessCompany",contract.getBusinessCompany());
+            data.put("businessCompanyId",contract.getDutyNumber());
+
             data.put("contractName",contract.getContractName());
             data.put("applyMoney",contract.getContractAmount());
             data.put("signDate",contract.getSignTime()==null?null:contract.getSignTime().toString());