Merge remote-tracking branch 'origin/master'

src/main/java/com/bonus/imgTool/imgUpload/service/impl/QualityInspectionServiceImpl.java

@@ -93,7 +93,6 @@ public class QualityInspectionServiceImpl implements QualityInspectionService {
         if (num > 0) {
             List<FileStorageDto> fileList = bean.getFileList();
             List<FileStorageDto> delFileList = bean.getDelFileList();
-
             //照片入库
             if (fileList != null && !fileList.isEmpty()) {
                 fileList.forEach(item -> {
@@ -105,11 +104,6 @@ public class QualityInspectionServiceImpl implements QualityInspectionService {
             }
             //照片删除
             if (delFileList != null && !delFileList.isEmpty()) {
-                delFileList.forEach(item -> {
-                    item.setSourceId(bean.getId());
-                    item.setCreateUser(bean.getUpdateUserId());
-                    item.setCreateUserName(bean.getUpdateUserName());
-                });
                 int j = safetyViolationDao.delImgPhoto(bean.getDelFileList());
             }
             //总库修改 TODO

src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java

@@ -100,16 +100,13 @@ public class SafetyViolationServiceImpl implements SafetyViolationService {
                 });
                 int j = dao.insertImgPhoto(bean.getFileList());
             }
-
-
-
             //照片删除
             if (delFileList != null && !delFileList.isEmpty()) {
-                delFileList.forEach(item -> {
+//                delFileList.forEach(item -> {
-                    item.setSourceId(bean.getId());
+//                    item.setSourceId(bean.getId());
-                    item.setCreateUser(bean.getUpdateUserId());
+//                    item.setCreateUser(bean.getUpdateUserId());
-                    item.setCreateUserName(bean.getUpdateUserName());
+//                    item.setCreateUserName(bean.getUpdateUserName());
-                });
+//                });
                 int j = dao.delImgPhoto(bean.getDelFileList());
             }
             //总库修改 TODO

src/main/java/com/bonus/imgTool/imgUpload/vo/SafetyViolationVo.java

@@ -116,6 +116,15 @@ public class SafetyViolationVo extends PageEntity {
      */
     private String rectPhotoNum;
 
+    /**
+     * 违章照片
+     */
+    private String vioPhoto;
+    /**
+     * 整改照片
+     */
+    private String rectPhoto;
+
     /**
      * 违章照片
      */

src/main/java/com/bonus/imgTool/imgUpload/vo/dto/SafetyViolationDto.java

@@ -120,10 +120,10 @@ public class SafetyViolationDto extends PageEntity {
      */
     private List<FileStorageDto> delFileList;
 
-
-    private String keyWord;
-
     private String proStatus;
 
+    private String proType;
+
+    private String uploadType;
 
 }

src/main/resources/mappers/backstage/SynthesisQueryMapper.xml

@@ -3,7 +3,7 @@
 		"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.imgTool.backstage.dao.SynthesisQueryDao">
     <insert id="addComprehensiveQuery">
-        insert into tb_coordinate_photo
+        insert into tb_comprehensive_query
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null and id != ''">id,</if>
             <if test="proId != null and proId != ''">pro_id,</if>
@@ -30,7 +30,7 @@
             <if test="createUserId != null">create_user_id,</if>
             <if test="createTime != null">create_time,</if>
             <if test="createUserName != null">create_user_name,</if>
-            <if test="updateUserid != null">update_user_id,</if>
+            <if test="updateUserId != null">update_user_id,</if>
             <if test="updateUserName != null">update_user_name,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="dataSource != null">data_source,</if>
@@ -62,7 +62,7 @@
             <if test="createUserId != null">#{createUserId},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="createUserName != null">#{createUserName},</if>
-            <if test="updateUserid != null">#{updateUserid},</if>
+            <if test="updateUserId != null">#{updateUserId},</if>
             <if test="updateUserName != null">#{updateUserName},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="dataSource != null">#{dataSource},</if>

src/main/resources/mappers/imgUpload/QualityInspectionMapper.xml

@@ -134,13 +134,15 @@
 		tsv.rect_status,
 		tsv.data_source,
 		count(DISTINCT sfr.id) as vioPhotoNum,
-		count(DISTINCT sfr2.id) as rectPhotoNum
+		count(DISTINCT sfr2.id) as rectPhotoNum,
+		group_concat(DISTINCT sfr.original_file_path) as vioPhoto,
+		group_concat(DISTINCT sfr2.original_file_path) as rectPhoto
 		FROM
 		tb_quality_inspection tsv
 		LEFT JOIN sys_file_resource sfr ON sfr.source_id = tsv.id
-		AND sfr.source_type = '1' and sfr.is_active = '1'
+		AND sfr.source_type = '3' and sfr.is_active = '1'
 		LEFT JOIN sys_file_resource sfr2 ON sfr2.source_id = tsv.id
-		AND sfr2.source_type = '2' and sfr2.is_active = '1'
+		AND sfr2.source_type = '4' and sfr2.is_active = '1'
 		left join tb_project tp on tp.id = tsv.pro_id and tp.is_active = '1'
 		<where>
 		    tsv.is_active = '1'
@@ -153,9 +155,6 @@
 			<if test="gxId != null">
 				and tsv.gx_id = #{gxId}
 			</if>
-			<if test="proType != null and proType != ''">
-				and tp.pro_type = #{proType}
-			</if>
 			<if test="proStatus != null and proStatus != ''">
 				and tp.status = #{proStatus}
 			</if>

src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml

@@ -147,7 +147,7 @@
 		update  sys_file_resource set is_active = '0'
 		WHERE
 		    id IN
-		<foreach collection="delFileList" item="item" separator=",">
+		<foreach collection="delFileList" item="item" separator="," open="(" close=")">
 			#{item.id}
 		</foreach>
 	</delete>
@@ -184,7 +184,9 @@
 		tsv.rect_status,
 		tsv.data_source,
 		count(DISTINCT sfr.id) as vioPhotoNum,
-		count(DISTINCT sfr2.id) as rectPhotoNum
+		count(DISTINCT sfr2.id) as rectPhotoNum,
+		group_concat(DISTINCT sfr.original_file_path) as vioPhoto,
+		group_concat(DISTINCT sfr2.original_file_path) as rectPhoto
 		FROM
 		tb_safety_violations tsv
 		LEFT JOIN sys_file_resource sfr ON sfr.source_id = tsv.id
@@ -203,9 +205,6 @@
 			<if test="gxId != null">
 				and tsv.gx_id = #{gxId}
 			</if>
-			<if test="proType != null and proType != ''">
-				and tp.pro_type = #{proType}
-			</if>
 			<if test="proStatus != null and proStatus != ''">
 				and tp.status = #{proStatus}
 			</if>