bugfix

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/dubbo/RemoteContractServiceImpl.java

@@ -11,6 +11,7 @@ import com.sckw.contract.model.entity.KwcContractLogistics;
 import com.sckw.contract.model.entity.KwcContractLogisticsUnit;
 import com.sckw.contract.model.entity.KwcContractTrade;
 import com.sckw.contract.service.KwcContractLogisticsUnitService;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.ContractStatusEnum;
 import com.sckw.core.model.enums.SigningWayEnum;
 import com.sckw.core.utils.CollectionUtils;
@@ -39,12 +40,22 @@ public class RemoteContractServiceImpl implements RemoteContractService {
         for (Long contractId : contractIds) {
             KwcContractLogistics kwcContractLogistics = kwcContractLogisticsMapper.selectById(contractId);
             if (Objects.nonNull(kwcContractLogistics)) {
+                Integer status = kwcContractLogistics.getStatus();
+                Integer delFlag = kwcContractLogistics.getDelFlag();
+                if (Objects.equals(status, ContractStatusEnum.SAVE.getCode()) || Objects.equals(status, ContractStatusEnum.COMPLETE.getCode()) || delFlag.equals(Global.YES)) {
+                    continue;
+                }
                 map.put(contractId, fillContractLogistics(kwcContractLogistics));
                 continue;
             }
 
             KwcContractTrade kwcContractTrade = kwcContractTradeMapper.selectById(contractId);
             if (Objects.nonNull(kwcContractTrade)) {
+                Integer status = kwcContractTrade.getStatus();
+                Integer delFlag = kwcContractTrade.getDelFlag();
+                if (Objects.equals(status, ContractStatusEnum.SAVE.getCode()) || Objects.equals(status, ContractStatusEnum.COMPLETE.getCode()) || delFlag.equals(Global.YES)) {
+                    continue;
+                }
                 map.put(contractId, fillContractTrade(kwcContractTrade));
             }
         }

sckw-modules/sckw-system/src/main/resources/mapper/KwsEnterpriseDao.xml

@@ -115,7 +115,7 @@
       and a.approval_time >= #{dto.approvalStartTime}
     </if>
     <if test="dto.approvalEndTime != null">
-      and a.approval_time &lt; date_add(#{dto.approvalEndTime}, INTERVAL 1 DAY))
+      and a.approval_time &lt; date_add(#{dto.approvalEndTime}, INTERVAL 1 DAY)
     </if>
     <if test="dto.status != null and dto.status != ''">
       and a.status = #{dto.status}

sckw-modules/sckw-system/src/main/resources/mapper/KwsRoleDao.xml

@@ -158,7 +158,7 @@
       and sr.create_time >= #{startTime,jdbcType=DATE}
     </if>
     <if test="endTime != null and endTime != ''" >
-      and sr.create_time &lt; date_add(#{endTime}, INTERVAL 1 DAY))
+      and sr.create_time &lt; date_add(#{endTime}, INTERVAL 1 DAY)
     </if>
     ORDER BY sr.create_time desc
   </select>

sckw-modules/sckw-system/src/main/resources/mapper/KwsUserDao.xml

@@ -256,7 +256,7 @@
       and su.create_time >= #{startTime}
     </if>
     <if test="endTime != null and endTime != ''">
-      and su.create_time &lt; date_add(#{endTime}, INTERVAL 1 DAY))
+      and su.create_time &lt; date_add(#{endTime}, INTERVAL 1 DAY)
     </if>
     ORDER BY su.create_time desc
   </select>