Merge remote-tracking branch 'origin/dev' into dev

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/ContractStatusEnum.java

@@ -12,11 +12,11 @@ public enum ContractStatusEnum {
     //已签约
     SIGNED(0, "已签约"),
     //已完结
-    COMPLETE(1, "已完结"),
+    COMPLETE(2, "已完结"),
     //已保存
-    SAVE(2, "已保存"),
+    SAVE(3, "已保存"),
     //签约中
-    SUBMIT(3, "签约中");
+    SUBMIT(1, "签约中");
 
     private final int code;
 

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/ContractTrackEnum.java

@@ -10,23 +10,23 @@ import lombok.Getter;
 @Getter
 public enum ContractTrackEnum {
 
-    //审批中
-    APPROVAL(1, "审批中"),
     //签约中
-    SIGNING(2, "签约中"),
-    //履约中
-    PERFORMANCE(3, "履约中");
+    SIGNING(1, "签约中"),
+    //已签约
+    SIGNED(0, "已签约"),
+    //已完结
+    OVER(2, "已完结");
 
     private final int code;
 
     private final String name;
 
-    ContractTrackEnum(int code, String name){
+    ContractTrackEnum(int code, String name) {
         this.code = code;
         this.name = name;
     }
 
-    public static ContractTrackEnum getName(int code){
+    public static ContractTrackEnum getName(int code) {
         for (ContractTrackEnum contractTrackEnum : values()) {
             if (contractTrackEnum.getCode() == code) {
                 return contractTrackEnum;

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/model/dto/res/KwsEnterpriseResDto.java

@@ -130,7 +130,7 @@ public class KwsEnterpriseResDto implements Serializable {
     /**
      * 企业地址-----区域表id---实际用途？
      */
-    private Integer cityName;
+    private String cityName;
 
     /**
      * 企业详细地址

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/res/QueryListResVo.java

@@ -49,12 +49,12 @@ public class QueryListResVo implements Serializable {
     /**
      * 发起人
      */
-    private String createByName;
+    private String initiateName;
 
     /**
      * 发起单位
      */
-    private String createEntName;
+    private String initiateEntName;
 
     /**
      * 创建时间

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

@@ -24,6 +24,7 @@ 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.CooperateTypeEnum;
+import com.sckw.core.model.enums.EntTypeEnum;
 import com.sckw.core.model.enums.SigningWayEnum;
 import com.sckw.core.model.page.PageHelperUtil;
 import com.sckw.core.model.page.PageResult;
@@ -401,6 +402,8 @@ public class KwcContractLogisticsService {
         Long entId = LoginUserHolder.getEntId();
         QueryListReqDto queryListReqDto = new QueryListReqDto();
         queryListReqDto.setEntId(entId);
+        queryListReqDto.setStatus(ContractStatusEnum.SIGNED.getCode());
+        queryListReqDto.setEntType(EntTypeEnum.LOGISTICS3.getCode());
         return kwcContractLogisticsMapper.queryList(queryListReqDto);
     }
 

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

@@ -34,7 +34,7 @@ public class KwcContractLogisticsTrackService {
         Date date = new Date();
         kwcContractLogisticsTrack.setId(new IdWorker(1L).nextId());
         kwcContractLogisticsTrack.setContractId(contractId);
-        kwcContractLogisticsTrack.setType(ContractTrackEnum.APPROVAL.getCode());
+        kwcContractLogisticsTrack.setType(ContractTrackEnum.SIGNING.getCode());
         kwcContractLogisticsTrack.setRemark("");
         kwcContractLogisticsTrack.setStatus(Global.NO);
         kwcContractLogisticsTrack.setCreateBy(LoginUserHolder.getUserId());

sckw-modules/sckw-contract/src/main/resources/mapper/KwcContractLogisticsMapper.xml

@@ -43,7 +43,7 @@
     <select id="queryList" resultType="com.sckw.contract.model.vo.res.QueryListResVo">
         select distinct a.*
           from kwc_contract_logistics a
-          left join kwc_contract_logistics_unit b on a.id = b.contractId
+          left join kwc_contract_logistics_unit b on a.id = b.contract_id
         where a.del_flag = 0
           and b.del_flag = 0
           <if test="entType != null">

sckw-modules/sckw-manage/src/main/resources/mapper/KwmCooperateMapper.xml

@@ -57,6 +57,12 @@
            <if test="reqDto.endTime != null">
                and a.create_time &lt;= #{reqDto.endTime}
            </if>
+           <if test="reqDto.applyTypeCode != null and reqDto.applyTypeCode == 1">
+               and a.ent_id = #{reqDto.currentEntId}
+           </if>
+           <if test="reqDto.applyTypeCode != null and reqDto.applyTypeCode == 2">
+               and a.ent_id != #{reqDto.currentEntId}
+           </if>
            <if test="reqDto.cooperateTypes != null and reqDto.cooperateTypes.size() > 0">
                and b.type in
                <foreach collection="reqDto.cooperateTypes" item="item" open="(" close=")" separator=",">

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsUserController.java

@@ -159,9 +159,10 @@ public class KwsUserController {
         return HttpResult.ok(HttpStatus.MSG_005);
     }
 
+
     @PostMapping("testEdit")
     public HttpResult testEdit() {
-        return HttpResult.ok(HttpStatus.MSG_005);
+        return HttpResult.ok(kwsUserService.test());
     }
 
     @PostMapping("testApprove")

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteBaseService.java

@@ -133,7 +133,7 @@ public class RemoteBaseService {
 
         List<KwsEntDept> kwsEntDepts = kwsEntDeptDao.selectByEntPid(id);
         if (CollectionUtils.isNotEmpty(kwsEntDepts)) {
-            entCacheResDto.setEntDeptIds(String.join(Global.COMMA, kwsEntDepts.stream().map(KwsEntDept::getEntPid).map(String::valueOf).toList()));
+            entCacheResDto.setEntDeptIds(String.join(Global.COMMA, kwsEntDepts.stream().map(KwsEntDept::getEntId).map(String::valueOf).toList()));
         }
     }
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteSystemServiceImpl.java

@@ -217,7 +217,6 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
             BeanUtils.copyProperties(kwsEnterpriseResDto, entCacheResDto);
             entCacheResDto.setDeptInfo(remoteBaseService.queryDeftInfoByEntId(entId));
             entCacheResDto.setCertificateInfo(remoteBaseService.queryCertificateByEntId(entId));
-            remoteBaseService.fillRelate(entCacheResDto);
             RedissonUtils.putString(key, JSON.toJSONString(entCacheResDto), Global.COMMON_EXPIRE);
             return entCacheResDto;
         }
@@ -261,7 +260,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
         Map<Long, EntCacheResDto> result = new HashMap<>();
         for (Long entId : entIdList) {
             EntCacheResDto entCacheResDto = queryEntCacheById(entId);
-
+            remoteBaseService.fillRelate(entCacheResDto);
             //有主体单位
             String entDeptIds = entCacheResDto.getEntDeptIds();
             if (StringUtils.isNotBlank(entDeptIds)) {

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

@@ -59,6 +59,7 @@ public class KwsDeptService {
         } else {
             params.setParentId(Long.parseLong(Global.PID));
             params.setParentIds(String.valueOf(deptId));
+            params.setLevel(Global.NUMERICAL_ONE);
         }
 
         //查该父级机构有多少子机构，sort依次增加

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

@@ -11,6 +11,7 @@ import com.sckw.system.api.model.dto.req.RegisterReqDto;
 import com.sckw.system.api.model.dto.req.UpdatePasswordReqDto;
 import com.sckw.system.api.model.dto.res.RegisterResDto;
 import com.sckw.system.dao.*;
+import com.sckw.system.dubbo.RemoteSystemServiceImpl;
 import com.sckw.system.model.*;
 import com.sckw.system.model.pojo.FindEntListPojo;
 import com.sckw.system.model.vo.req.*;
@@ -57,6 +58,9 @@ public class KwsUserService {
     @Autowired
     KwsMenuService kwsMenuService;
 
+    @Autowired
+    private RemoteSystemServiceImpl remoteSystemService;
+
     /**
      * @param reqVo 入参
      * @desc: 新增
@@ -572,4 +576,9 @@ public class KwsUserService {
         //重置密码
         updatePwd(reqVo.getNewPassword(), kwsUser);
     }
+
+    public String test() {
+        remoteSystemService.queryEntTreeByIds(Collections.singletonList(Long.parseLong("156382319450525696")));
+        return "";
+    }
 }