youhua

platform-dao/src/main/java/com/platform/dao/dto/check/CheckJobDTO.java

@@ -24,6 +24,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class CheckJobDTO extends BaseDTO implements Serializable {
+    private Integer record;//1:代表保养记录
     private List<Integer> standardLevelList;
     private List<Integer> periodTypeList;
     private List<Integer> sbLevelList;

platform-dao/src/main/java/com/platform/dao/mapper/check/CheckJobMapper.java

@@ -25,6 +25,9 @@ public interface CheckJobMapper extends MyMapper<CheckJob> {
      */
     List<CheckJobVO> selectList(CheckJobDTO dto);
 
+    List<CheckJobVO> selectList2(CheckJobDTO dto);
+
+
     /**
      * 查询任务列表
      * @param planId

platform-dao/src/main/resources/mapper/check/CheckJobMapper.xml

@@ -237,6 +237,24 @@
         standard.period asc
     </select>
 
+    <select id="selectList2" parameterType="com.platform.dao.dto.check.CheckJobDTO"
+            resultType="com.platform.dao.vo.query.check.CheckJobVO">
+        select checkjob.*, u.real_name as checkUserName,
+        sbinfo.name sbName, sbinfo.no sbNo, sbinfo.level sbLevel,sbinfo.id,
+        partinfo.name partName,
+        standard.no standardNo, standard.name standardName,standard.level standardLevel,
+        standard.period period, standard.period_type periodType,position .id as positionId,position .name as positionName
+        from t_check_job as checkjob
+        left join t_sb_info sbinfo on sbinfo.id = checkjob.sb_id
+        left join t_part_info partinfo on partinfo.id = checkjob.part_id
+        left join t_check_standard standard on standard.id = checkjob.standard_id
+        left join t_sys_user u on checkjob.check_user_id = u.user_id
+        left join t_sb_position position on position.id = sbinfo.position_id
+        <where>
+            <include refid="List_Condition"/>
+        </where>
+    </select>
+
     <select id="getScreenCountByTime" parameterType="com.platform.dao.dto.check.CheckJobDTO"
             resultType="com.platform.dao.vo.query.check.CheckJobVO">
         select count(checkjob.id) as countNum

platform-service/src/main/java/com/platform/service/check/impl/CheckJobServiceImpl.java

@@ -508,7 +508,12 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
             model.setSearchEndTime(DateUtils.getLastDayOfThisMonth());
         }
         PageHelper.startPage(pageNum, pageSize);
-        List<CheckJobVO> checkJobVOS1 = mapper.selectList(model);
+        List<CheckJobVO> checkJobVOS1 = new ArrayList<>();
+        if(model.getRecord()!=null&&model.getRecord()==1) {
+             checkJobVOS1 = mapper.selectList2(model);
+        }else {
+            checkJobVOS1 = mapper.selectList(model);
+        }
         if (checkJobVOS.size()>0){
             checkJobVOS1.addAll(checkJobVOS);
         }