Browse Source

1.档案导入的同一个项目的记录数与档案管理中相同位置处的不一致
2.档案管理效率优化

heshan 2 years ago
parent
commit
f8c8712903

+ 1 - 0
DataCheck/src/main/java/com/tofly/dataCheck/controller/RecordManagerController.java

@@ -184,6 +184,7 @@ public class RecordManagerController {
                     d.setCreateUser(SecurityUtils.getUserId());
                     d.setCreateTime(new Date());
                     d.setLinkName(recordManager.getLinkName());
+                    d.setFileType(recordManager.getFileType());
                     toflyFileService.save(d);
                 });
                 return ResultRespone.success();

+ 3 - 13
DataCheck/src/main/resources/mapper/DetectDataMapper.xml

@@ -155,22 +155,11 @@
 
     <select id="searchDetectDataList"  resultMap="detectDataVoMap">
         SELECT
-        a.id,
-        a.info_id,
         a.area,
         a.testing_zone,
         a.road_name,
-        a.start_code,
-        a.end_code,
-        a.pipe_length,
-        a.section_data_one,
-        a.section_data_two,
-        a.is_order,
-        a.remark,
-        a.STATUS,
-        a.check_flag,
-        c.name,
-        c.id prj_id
+        a.prj_id,
+        c.NAME
         FROM
         tf_ywpn_detect_data_w a
         left join tf_ywpn_project_standing_book c on a.prj_id=c.id
@@ -189,6 +178,7 @@
         <if test="param.testingZone!=null">
             and a.testing_zone=#{param.testingZone}
         </if>
+        GROUP BY a.prj_id,a.area,a.testing_zone,a.road_name
     </select>
 
     <select id="detectGroupData"  resultMap="detectDataVoMap">

+ 1 - 0
DataCheck/src/main/resources/mapper/RecordManagerMapper.xml

@@ -68,6 +68,7 @@
         where a.table_name='TF_YWPN_RECORD_MANAGER_W'
         and b.id is not null
         and a.del_flag=0
+        and a.file_type is not null
         <if test="param.startTime!=null and param.endTime!=null">
             and b.create_time BETWEEN #{param.startTime} and #{param.endTime}
         </if>