Merge remote-tracking branch 'origin/master'

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/mysql/dk/DkMapper.java

@@ -38,4 +38,6 @@ public interface DkMapper extends BaseMapperX<DkDO> {
     IPage<TaskCrkxxRespVO> getCrkxxByCfId(IPage<TaskCrkxxRespVO> page,@Param("pageReqVO") TaskPageReqVO pageReqVO);
 
     IPage<TaskZjxxRespVO> getZjxxByCfId(IPage<TaskZjxxRespVO> page, @Param("pageReqVO") TaskPageReqVO pageReqVO);
+
+    List<TaskCaxxRespVO> selectCaxxListByKqId( @Param("pageReqVO")  TaskPageReqVO reqVO);
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/task/TaskServiceImpl.java

@@ -11,7 +11,6 @@ import com.unis.framework.security.core.LoginUser;
 import com.unis.framework.security.core.util.SecurityFrameworkUtils;
 import com.unis.module.coding.controller.admin.task.vo.*;
 import com.unis.module.coding.dal.dataobject.bank.BankDO;
-import com.unis.module.coding.dal.dataobject.caxx.CaxxDO;
 import com.unis.module.coding.dal.dataobject.cwxx.CwxxDO;
 import com.unis.module.coding.dal.dataobject.cwxxyear.CwxxYearDO;
 import com.unis.module.coding.dal.dataobject.dk.DkDO;
@@ -20,7 +19,6 @@ import com.unis.module.coding.dal.dataobject.kqxx.KqxxDO;
 import com.unis.module.coding.dal.dataobject.province.ProvinceDO;
 import com.unis.module.coding.dal.dataobject.users.UsersDO;
 import com.unis.module.coding.dal.mysql.bank.BankMapper;
-import com.unis.module.coding.dal.mysql.caxx.CaxxMapper;
 import com.unis.module.coding.dal.mysql.cwxx.CwxxMapper;
 import com.unis.module.coding.dal.mysql.cwxxyear.CwxxYearMapper;
 import com.unis.module.coding.dal.mysql.dk.DkMapper;
@@ -32,7 +30,6 @@ import com.unis.module.core.enums.ErrorCodeConstants;
 import com.unis.module.core.enums.project.DeliveryHyState;
 import com.unis.module.system.api.permission.PermissionApi;
 import com.unis.module.system.enums.permission.RoleCodeEnum;
-import com.unis.module.system.service.user.AdminUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
@@ -41,7 +38,6 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
@@ -65,8 +61,6 @@ public class TaskServiceImpl implements TaskService {
     @Resource
     private ProvinceMapper provinceMapper;
     @Resource
-    private CaxxMapper caxxMapper;
-    @Resource
     private KqxxMapper kqxxMapper;
     @Resource
     private DwxxMapper dwxxMapper;
@@ -78,8 +72,6 @@ public class TaskServiceImpl implements TaskService {
     private BankMapper bankMapper;
     @Resource
     private UsersMapper usersMapper;
-    @Resource
-    private AdminUserService userService;
 
     @Override
     public IPage<TaskRespVO> getTaskList(TaskPageReqVO pageReqVO) {
@@ -180,22 +172,10 @@ public class TaskServiceImpl implements TaskService {
 
     @Override
     public List<TaskCaxxRespVO> getCaxxByKqId(TaskPageReqVO reqVO) {
+        // 根据角色不同，查询不同数据
+        addParamDeptIds(reqVO);
 
-        List<CaxxDO> caxxDOS = caxxMapper.selectListByKqId(reqVO.getKqId());
-
-        if(ObjectUtils.isEmpty(caxxDOS)) {
-            List<TaskCaxxRespVO> list = BeanUtils.toBean(caxxDOS, TaskCaxxRespVO.class);
-
-            KqxxDO kqxxDO = kqxxMapper.selectById(list.get(0).getKqId());
-            list.forEach(taskCaxxRespVO -> {
-                taskCaxxRespVO.setZcckj(kqxxDO.getZcckj());
-                taskCaxxRespVO.setWtbgckj(kqxxDO.getWtbgckj());
-            });
-
-            return list;
-        }
-
-        return new ArrayList<>();
+        return dkMapper.selectCaxxListByKqId(reqVO);
     }
 
     @Override

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/dk/DkMapper.xml

@@ -251,4 +251,44 @@
             dz.DELETED = 0 AND dz.CF_ID = #{pageReqVO.caId}
         ORDER BY dz.JCSJ DESC ,dz.ID  DESC
     </select>
+    <select id="selectCaxxListByKqId"
+            resultType="com.unis.module.coding.controller.admin.task.vo.TaskCaxxRespVO">
+        SELECT
+            dc.KQID AS KQ_ID,
+            dc.ID AS CA_ID,
+            dc.CFMC,
+            dc.CFLX,
+            dc.CAZT,
+            dc.SJCR,
+            dc.SJSYNX,
+            dc.SFKC,
+            dk."zcckj",
+            dk."wtbgckj"
+        FROM
+            ${pageReqVO.tableName} dp
+            LEFT JOIN DELIVERY_CAXX dc ON dp.CA_ID = dc.ID
+            LEFT JOIN DELIVERY_KQXX dk ON dp.KQ_ID = dk.ID
+        WHERE
+        dk.DELETED = 0 AND dk.SFZX = 0 and dp.DELETED = 0 AND dc.DELETED = 0
+        and dp.KQ_ID = #{pageReqVO.kqId}
+        <if test="pageReqVO.hyState != null">
+            AND dp.HY_STATE = #{pageReqVO.hyState}
+        </if>
+        <if test="pageReqVO.hyryId != null">
+            AND dp.HYRY_ID = #{pageReqVO.hyryId}
+        </if>
+        <if test="pageReqVO.bankType != null and pageReqVO.bankType != ''">
+            AND FIND_IN_SET(#{pageReqVO.bankType},dp.RDYH_ID)
+        </if>
+        <if test="pageReqVO.kqIds != null and pageReqVO.kqIds.size() > 0">
+            AND dp.KQ_ID IN
+            <foreach collection="pageReqVO.kqIds" item="kqId" open="(" separator="," close=")">
+                #{kqId}
+            </foreach>
+        </if>
+        GROUP BY
+        dc.ID
+        ORDER BY
+        dc.ID desc
+    </select>
 </mapper>