bugfix

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/CommonBusinessService.java

@@ -10,6 +10,7 @@ import com.sckw.contract.model.entity.KwcContractTrade;
 import com.sckw.contract.model.vo.req.ContractLogisticsReqVo;
 import com.sckw.contract.model.vo.req.ESignCallBackReqVo;
 import com.sckw.core.exception.SystemException;
+import com.sckw.core.model.enums.ContractTrackEnum;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.OkHttpUtils;
 import com.sckw.core.web.constant.HttpStatus;
@@ -54,6 +55,12 @@ public class CommonBusinessService {
     @Autowired
     private KwcContractTradeService kwcContractTradeService;
 
+    @Autowired
+    private KwcContractLogisticsTrackService kwcContractLogisticsTrackService;
+
+    @Autowired
+    private KwcContractTradeTrackService kwcContractTradeTrackService;
+
     /**
      * @return Map
      * @desc: 查企业
@@ -74,9 +81,11 @@ public class CommonBusinessService {
     @Transactional(rollbackFor = {})
     public void approval(ESignCallBackReqVo reqVo) {
         Long contractId = reqVo.getContractId();
+        int code = ContractTrackEnum.SIGNING.getCode();
         KwcContractTrade kwcContractTrade = kwcContractTradeMapper.selectById(contractId);
         if (Objects.nonNull(kwcContractTrade)) {
             kwcContractTradeService.approval(reqVo.getContractId(), reqVo.getStatus(), reqVo.getRemark());
+            kwcContractLogisticsTrackService.saveContractLogisticsTrack(contractId, code);
             notifyOrder(contractId, kwcContractTrade.getCreateBy());
             return;
         }
@@ -84,6 +93,7 @@ public class CommonBusinessService {
         KwcContractLogistics kwcContractLogistics = kwcContractLogisticsMapper.selectById(contractId);
         if (Objects.nonNull(kwcContractLogistics)) {
             kwcContractLogisticsService.approval(reqVo.getContractId(), reqVo.getStatus(), reqVo.getRemark());
+            kwcContractTradeTrackService.saveContractTradeTrack(contractId, code);
             notifyOrder(contractId, kwcContractLogistics.getCreateBy());
             return;
         }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractLogisticsService.java

@@ -17,6 +17,7 @@ import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.ContractStatusEnum;
+import com.sckw.core.model.enums.ContractTrackEnum;
 import com.sckw.core.model.enums.CooperateTypeEnum;
 import com.sckw.core.model.enums.EntTypeEnum;
 import com.sckw.core.model.page.PageHelperUtil;
@@ -363,7 +364,7 @@ public class KwcContractLogisticsService {
                                               reqVo.getBaseInfo().getCheckedEntId(),
                                               reqVo.getBaseInfo().getCarrierEntId(),
                                               reqVo.getContractFile(),
-                    id,
+                                              id,
                                               reqVo.getBaseInfo().getContractName());
         }
 
@@ -389,7 +390,7 @@ public class KwcContractLogisticsService {
         if (kwcContractLogisticsMapper.updateById(kwcContractLogistics) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
         }
-        kwcContractLogisticsTrackService.saveContractLogisticsTrack(id);
+        kwcContractLogisticsTrackService.saveContractLogisticsTrack(id, ContractTrackEnum.SIGNING.getCode());
     }
 
 
@@ -689,6 +690,8 @@ public class KwcContractLogisticsService {
         if (kwcContractLogisticsMapper.updateById(kwcContractLogistics) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
         }
+
+
     }
 
 }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractLogisticsTrackService.java

@@ -44,17 +44,17 @@ public class KwcContractLogisticsTrackService {
     private RemoteSystemService remoteSystemService;
 
     /**
-     * @param contractId 合同id
+     * @param contractId 合同id, status签约状态
      * @desc: 存审批记录
      * @author: czh
      * @date: 2023/7/14
      */
-    public void saveContractLogisticsTrack(Long contractId) {
+    public void saveContractLogisticsTrack(Long contractId, Integer status) {
         KwcContractLogisticsTrack kwcContractLogisticsTrack = new KwcContractLogisticsTrack();
         Date date = new Date();
         kwcContractLogisticsTrack.setId(new IdWorker(1L).nextId());
         kwcContractLogisticsTrack.setContractId(contractId);
-        kwcContractLogisticsTrack.setType(ContractTrackEnum.SIGNING.getCode());
+        kwcContractLogisticsTrack.setType(status);
         kwcContractLogisticsTrack.setRemark("");
         kwcContractLogisticsTrack.setStatus(Global.NO);
         kwcContractLogisticsTrack.setCreateBy(LoginUserHolder.getUserId());

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractTradeService.java

@@ -444,11 +444,12 @@ public class KwcContractTradeService {
      */
     private void changeToSubmit(Long id) {
         KwcContractTrade kwcContractTrade = kwcContractTradeMapper.selectById(id);
-        kwcContractTrade.setStatus(ContractStatusEnum.SUBMIT.getCode());
+        int code = ContractStatusEnum.SUBMIT.getCode();
+        kwcContractTrade.setStatus(code);
         if (kwcContractTradeMapper.updateById(kwcContractTrade) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
         }
-        kwcContractTradeTrackService.saveContractTradeTrack(id);
+        kwcContractTradeTrackService.saveContractTradeTrack(id, code);
     }
 
     /**
@@ -682,9 +683,10 @@ public class KwcContractTradeService {
             throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.CONTRACT_NOT_EXISTS);
         }
 
+        Date date = new Date();
         kwcContractTrade.setStatus(status);
         kwcContractTrade.setRemark(remark);
-        kwcContractTrade.setUpdateTime(new Date());
+        kwcContractTrade.setUpdateTime(date);
         kwcContractTrade.setUpdateBy(LoginUserHolder.getUserId());
         if (kwcContractTradeMapper.updateById(kwcContractTrade) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractTradeTrackService.java

@@ -42,12 +42,12 @@ public class KwcContractTradeTrackService {
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
-    public void saveContractTradeTrack(Long contractId) {
+    public void saveContractTradeTrack(Long contractId, Integer status) {
         Date date = new Date();
         KwcContractTradeTrack kwcContractTradeTrack = new KwcContractTradeTrack();
         kwcContractTradeTrack.setId(new IdWorker(1L).nextId());
         kwcContractTradeTrack.setContractId(contractId);
-        kwcContractTradeTrack.setType(ContractTrackEnum.SIGNING.getCode());
+        kwcContractTradeTrack.setType(status);
         kwcContractTradeTrack.setRemark("");
         kwcContractTradeTrack.setStatus(Global.NO);
         kwcContractTradeTrack.setCreateBy(LoginUserHolder.getUserId());

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsMenuService.java

@@ -8,6 +8,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.MenuTypeEnum;
+import com.sckw.core.model.enums.SystemTypeEnum;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.IdWorker;
@@ -263,7 +264,8 @@ public class KwsMenuService {
     }
 
     private void extracted(Long userId, FindMenuTreePojo findMenuTreePojo) {
-        if (Objects.equals(LoginUserHolder.getIsMain(), Global.YES)) {
+        //运营端的管理员不做过滤
+        if (Objects.equals(LoginUserHolder.getIsMain(), Global.YES) && Objects.equals(LoginUserHolder.getSystemType(), SystemTypeEnum.MANAGE.getCode())) {
             return;
         }