pom.xml

@@ -459,7 +459,7 @@
 		<dependency>
 			<groupId>cn.hutool</groupId>
 			<artifactId>hutool-all</artifactId>
-			<version>5.8.16</version>
+			<version>5.0.5</version>
 		</dependency>
 
 		<dependency>

src/main/java/com/zcloud/controller/app/AppHiddenController.java

@@ -1,6 +1,5 @@
 package com.zcloud.controller.app;
 
-import cn.hutool.core.io.FileUtil;
 import cn.hutool.crypto.digest.DigestUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -553,7 +552,7 @@ public class AppHiddenController extends BaseController {
 		}
 		File tempFile = new File(file.getOriginalFilename());
 		FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile);
-		String md5 = FileUtil.isEmpty(tempFile) ? "" : DigestUtil.md5Hex(tempFile);
+		String md5 = DigestUtil.md5Hex(tempFile);
 		if (!FileUpload.isImage(tempFile)) {
 			tempFile.delete();
 			map.put("result", "failed");

src/main/java/com/zcloud/controller/app/AppImgFilesController.java

@@ -1,6 +1,5 @@
 package com.zcloud.controller.app;
 
-import cn.hutool.core.io.FileUtil;
 import cn.hutool.crypto.digest.DigestUtil;
 import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.Page;
@@ -37,9 +36,7 @@ public class AppImgFilesController extends BaseController {
 	@Autowired
 	private ImgFilesService imgfilesService;
 
-    /**
+	/**完成
-     * 完成
-     *
 	 * @param
 	 * @throws Exception
 	 */
@@ -67,8 +64,8 @@ public class AppImgFilesController extends BaseController {
                 MultipartFile file = files[i];
 //                 保存文件
                 File tempFile = new File(file.getOriginalFilename());
+				String md5 = DigestUtil.md5Hex(tempFile);
         		FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile);
-                String md5 = FileUtil.isEmpty(tempFile) ? "" : DigestUtil.md5Hex(tempFile);
         		if(!FileUpload.isImage(tempFile) && !TYPE.equals("2") && !TYPE.equals("102")) {//四色图改为json文件,不用判断类型
 					tempFile.delete();
 					map.put("result", "failed");
@@ -112,9 +109,7 @@ public class AppImgFilesController extends BaseController {
 	}
 
 
-    /**
+	/**新增
-     * 新增
-     *
 	 * @param
 	 * @throws Exception
 	 */
@@ -147,9 +142,7 @@ public class AppImgFilesController extends BaseController {
 	}
 
 
-    /**
+	/**完成
-     * 完成
-     *
 	 * @param
 	 * @throws Exception
 	 */
@@ -216,9 +209,7 @@ public class AppImgFilesController extends BaseController {
 		return map;
 	}
 
-    /**
+	/**删除
-     * 删除
-     *
 	 * @param out
 	 * @throws Exception
 	 */
@@ -237,9 +228,7 @@ public class AppImgFilesController extends BaseController {
 		return map;
 	}
 
-    /**
+	/**修改
-     * 修改
-     *
 	 * @param
 	 * @throws Exception
 	 */
@@ -256,9 +245,7 @@ public class AppImgFilesController extends BaseController {
 		return map;
 	}
 
-    /**
+	/**列表
-     * 列表
-     *
 	 * @param page
 	 * @throws Exception
 	 */
@@ -280,9 +267,7 @@ public class AppImgFilesController extends BaseController {
 		return map;
 	}
 
-    /**
+	 /**去修改页面获取数据
-     * 去修改页面获取数据
-     *
 	 * @param
 	 * @throws Exception
 	 */
@@ -300,9 +285,7 @@ public class AppImgFilesController extends BaseController {
 		return map;
 	}
 
-    /**
+	 /**批量删除
-     * 批量删除
-     *
 	 * @param
 	 * @throws Exception
 	 */
@@ -326,9 +309,7 @@ public class AppImgFilesController extends BaseController {
 		return map;
 	}
 
-    /**
+	 /**导出到excel
-     * 导出到excel
-     *
 	 * @param
 	 * @throws Exception
 	 */
@@ -360,9 +341,7 @@ public class AppImgFilesController extends BaseController {
 	}
 
 
-    /**
+	 /**查询图片集合
-     * 查询图片集合
-     *
 	 * @param
 	 * @throws Exception
 	 */

src/main/java/com/zcloud/controller/system/LoginController.java

@@ -153,6 +153,7 @@ public class LoginController extends BaseController {
             } catch (AuthenticationException ae) {
                 errInfo = "usererror";
             }
+            Integer port = SpringUtil.getApplicationContext().getEnvironment().getProperty("server.port", Integer.class);
             if (subject.isAuthenticated()) {                            //验证是否登录成功
                 removeSession(USERNAME);
 
@@ -177,7 +178,8 @@ public class LoginController extends BaseController {
                         if (backEndPath.get("result").toString().equals("success")) {
                             backEndPath.put("baseImgPath",map.get("baseImgPath").toString());
                             backEndPath.put("USER_IDENTITY",map.get("USER_IDENTITY").toString());
-                            backEndPath.put("BACKENDADDR", map.get("BACKENDADDR").toString());
+
+                            backEndPath.put("BACKENDADDR", "http://" + ip + ":" + port + "/");
                             System.out.println("登录返回参数：" + backEndPath);
                             return backEndPath;
                         } else {
@@ -188,6 +190,7 @@ public class LoginController extends BaseController {
                             return map;
                         }
                     }
+                    map.put("BACKENDADDR", "http://" + ip + ":" + port + "/");
                     if ("99".equals(pd.getString("STATUS"))) {
                         errInfo = "userlock";
                         map.put("result", "fail");

src/main/java/com/zcloud/controller/system/UsersController.java

@@ -575,8 +575,8 @@ public class UsersController extends BaseController {
             usersService.resetCardNo(pd);
         }
         //每次人员信息更改都要将人物状态置为未推送且不可查询，需推送后在进行使用
-//        pd.put("ISDELETE","1");
+        pd.put("ISDELETE","1");
-//        pd.put("ISPUSH","0");
+        pd.put("ISPUSH","0");
         usersService.editUser(pd);    //执行修改
         if ("true".equals(pd.getString("ISSTUDENT"))) {
             pd.put("IS_ONLINELEARNING", "1");
@@ -1027,7 +1027,6 @@ public class UsersController extends BaseController {
             PageData userPd = new PageData();
             userPd.put("USER_ID",ID);
             PageData userinfo = usersService.findById(userPd);
-            userinfo.put("PHONE",userinfo.get("USERNAME"));
             userinfo.put("ISDELETE","0");
             map.put("USERINFO", userinfo);
             map.put("USER_ID",ID);

src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalExplainMapper.xml

@@ -207,10 +207,7 @@
         </if>
         GROUP BY se.INSPECTION_ID
         ORDER BY FIELD(se.INSPECTION_STATUS, '2', '1', '0', '3', '4', '5', '6', '7', '8', '-1', '-2'),
-        <if test="pd.loginUserId != null and pd.loginUserId != ''">
+                 FIELD(if(se.INSPECTED_SITEUSER_ID = #{pd.loginUserId},se.INSPECTED_SITEUSER_ID,'1'), se.INSPECTED_SITEUSER_ID, '1'),
-            FIELD(if(se.INSPECTED_SITEUSER_ID = #{pd.loginUserId}, se.INSPECTED_SITEUSER_ID, '1'),
-                  se.INSPECTED_SITEUSER_ID, '1'),
-        </if>
                  se.INSPECTION_TIME_START DESC
     </select>
 

src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalInspectorMapper.xml

@@ -122,25 +122,21 @@
 
 	<!-- 列表 -->
 	<select id="datalistPage" parameterType="page" resultType="pd">
-        select iou.NAME                                                 INSPECTION_ORIGINATOR_NAME,
+		select
+		iou.NAME INSPECTION_ORIGINATOR_NAME,
 		iod.NAME INSPECTION_DEPARTMENT_NAME,
 		isd.NAME INSPECTED_DEPARTMENT_NAME,
 		isu.NAME INSPECTED_SITEUSER_NAME,
 		IFNULL(GROUP_CONCAT(REPLACE(siu.NAME,'/',',')),'') AS INSPECTION_USER_NAME,
-               CASE
+		CASE WHEN IFNULL(se.INSPECTION_TYPE_OTHER, '') = '' THEN d.NAME ELSE se.INSPECTION_TYPE_OTHER END INSPECTION_TYPE_NAME,
-                   WHEN IFNULL(se.INSPECTION_TYPE_OTHER, '') = '' THEN d.NAME
-                   ELSE se.INSPECTION_TYPE_OTHER END                    INSPECTION_TYPE_NAME,
 		se.INSPECTION_TIME_START,
 		se.INSPECTION_TIME_END,
 		se.INSPECTION_STATUS,
 		se.INSPECTION_SUBJECT,
 		se.INSPECTED_DEPARTMENT_ID,
-        <include refid="Field">
+		<include refid="Field"></include>
-        </include>
 		from
-        <include refid="tableName">
+		<include refid="tableName"></include> f
-        </include>
-        f
 		 INNER JOIN BUS_INSPECTION_SAFETYENVIRONMENTAL se ON se.INSPECTION_ID = f.INSPECTION_ID
 		 LEFT JOIN VI_USER_ALL iou ON iou.USER_ID = se.INSPECTION_ORIGINATOR_ID
 		 LEFT JOIN VI_DEPARTMENT_ALL iod ON iod.DEPARTMENT_ID = iou.DEPARTMENT_ID
@@ -150,10 +146,8 @@
 		AND si.ISDELETE = '0'
 		LEFT JOIN vi_user_all siu ON siu.USER_ID = si.INSPECTION_USER_ID
 		 LEFT JOIN sys_dictionaries d ON d.BIANMA = se.INSPECTION_TYPE
-        where f.ISDELETE = '0'
+		where f.ISDELETE = '0' and se.ISDELETE = '0'
-          and se.ISDELETE = '0'
+		<if test="pd.supDeparIds != null and pd.supDeparIds != ''"><!-- 权限显示 -->
-        <if test="pd.supDeparIds != null and pd.supDeparIds != ''">
-            <!-- 权限显示 -->
 			<choose>
 				<when test="pd.roleLevel == '0'">
 				</when>
@@ -165,55 +159,44 @@
 				</when>
 			</choose>
 		</if>
-        <if test="pd.INSPECTION_USER_ID != null and pd.INSPECTION_USER_ID != ''">
+		<if test="pd.INSPECTION_USER_ID != null and pd.INSPECTION_USER_ID != ''"><!-- 检查人 -->
-            <!-- 检查人 -->
 			and f.INSPECTION_USER_ID = #{pd.INSPECTION_USER_ID}
 		</if>
-        <if test="pd.INSPECTION_SUBJECT != null and pd.INSPECTION_SUBJECT != ''">
+		<if test="pd.INSPECTION_SUBJECT != null and pd.INSPECTION_SUBJECT != ''"><!-- 检查题目 -->
-            <!-- 检查题目 -->
 			and se.INSPECTION_SUBJECT = #{pd.INSPECTION_SUBJECT,jdbcType=VARCHAR}
 		</if>
-        <if test="pd.INSPECTED_DEPARTMENT_NAME != null and pd.INSPECTED_DEPARTMENT_NAME != ''">
+		<if test="pd.INSPECTED_DEPARTMENT_NAME != null and pd.INSPECTED_DEPARTMENT_NAME != ''"><!-- 被检查单位 -->
-            <!-- 被检查单位 -->
 			and isd.NAME LIKE CONCAT(CONCAT('%', #{pd.INSPECTED_DEPARTMENT_NAME}),'%')
 		</if>
-        <if test="pd.INSPECTION_DEPARTMENT_NAME != null and pd.INSPECTION_DEPARTMENT_NAME != ''">
+		<if test="pd.INSPECTION_DEPARTMENT_NAME != null and pd.INSPECTION_DEPARTMENT_NAME != ''"><!-- 检查部门 -->
-            <!-- 检查部门 -->
 			and iod.NAME LIKE CONCAT(CONCAT('%', #{pd.INSPECTION_DEPARTMENT_NAME}),'%')
 		</if>
-        <if test="pd.INSPECTION_ORIGINATOR_NAME != null and pd.INSPECTION_ORIGINATOR_NAME != ''">
+		<if test="pd.INSPECTION_ORIGINATOR_NAME != null and pd.INSPECTION_ORIGINATOR_NAME != ''"><!-- 检查发起人 -->
-            <!-- 检查发起人 -->
 			and iou.NAME LIKE CONCAT(CONCAT('%', #{pd.INSPECTION_ORIGINATOR_NAME}),'%')
 		</if>
-        <if test="pd.INSPECTION_TYPE != null and pd.INSPECTION_TYPE != ''">
+		<if test="pd.INSPECTION_TYPE != null and pd.INSPECTION_TYPE != ''"><!-- 检查类型 -->
-            <!-- 检查类型 -->
 			and se.INSPECTION_TYPE = #{pd.INSPECTION_TYPE}
 		</if>
-        <if test="pd.INSPECTION_TIME_START != null and pd.INSPECTION_TIME_START != ''">
+		<if test="pd.INSPECTION_TIME_START != null and pd.INSPECTION_TIME_START != ''"><!-- 检查时间 -->
-            <!-- 检查时间 -->
 			and se.INSPECTION_TIME_START &gt;= CONCAT(#{pd.INSPECTION_TIME_START}, ' 00:00')
 		</if>
-        <if test="pd.INSPECTION_TIME_END != null and pd.INSPECTION_TIME_END != ''">
+		<if test="pd.INSPECTION_TIME_END != null and pd.INSPECTION_TIME_END != ''"><!-- 检查时间 -->
-            <!-- 检查时间 -->
 			and se.INSPECTION_TIME_END &lt;= CONCAT(#{pd.INSPECTION_TIME_END}, ' 23:59')
 		</if>
-        <if test="pd.INSPECTION_STATUS != null and pd.INSPECTION_STATUS != ''">
+		<if test="pd.INSPECTION_STATUS != null and pd.INSPECTION_STATUS != ''"><!-- 检查状态 -->
-            <!-- 检查状态 -->
 			and se.INSPECTION_STATUS = #{pd.INSPECTION_STATUS}
 		</if>
 
-        <if test="pd.KEYWORDS != null and pd.KEYWORDS != ''">
+		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 被检查单位 -->
-            <!-- 被检查单位 -->
 			and (
 			isd.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
 			OR iod.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
 			)
 		</if>
 		GROUP BY f.INSPECTION_ID
-        ORDER BY FIELD(if(f.INSPECTION_USER_SIGN_TIME is not null, '2', '1'), '1', '2'),
+		ORDER BY
-        <if test="pd.loginUserId != null and pd.loginUserId != ''">
+		FIELD(if(f.INSPECTION_USER_SIGN_TIME is not null,'2','1'), '1','2'),
 		FIELD(if(se.INSPECTED_SITEUSER_ID = #{pd.loginUserId},#{pd.loginUserId},'1'), #{pd.loginUserId}, '1'),
-        </if>
 		FIELD (se.INSPECTION_STATUS , '0','1','2','3','4','5','6','7','8','-1','-2') ,
 		se.INSPECTION_TIME_START DESC , se.INSPECTION_TIME_END DESC
 	</select>

src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalMapper.xml

@@ -308,9 +308,6 @@
 		<if test="pd.INSPECTION_ORIGINATOR_NAME != null and pd.INSPECTION_ORIGINATOR_NAME != ''"><!-- 检查发起人 -->
 			and iou.NAME LIKE CONCAT(CONCAT('%', #{pd.INSPECTION_ORIGINATOR_NAME}),'%')
 		</if>
-		<if test="pd.INSPECTION_CASE != null and pd.INSPECTION_CASE != ''"><!-- 检查发起人 -->
-			and biss.SITUATION LIKE CONCAT('%', #{pd.INSPECTION_CASE},'%')
-		</if>
 		<if test="pd.INSPECTION_TYPE != null and pd.INSPECTION_TYPE != ''"><!-- 检查类型 -->
 			and f.INSPECTION_TYPE = #{pd.INSPECTION_TYPE}
 		</if>
@@ -342,6 +339,16 @@
 				OR iod.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
 			)
 		</if>
+		<!-- 2021/10/9  同步监管端搜索字段 -->
+		<if test="pd.INSPECTION_USER_NAME != null and pd.INSPECTION_USER_NAME != ''">
+			and REPLACE(siu.NAME,'/',',') LIKE CONCAT(CONCAT('%', #{pd.INSPECTION_USER_NAME}),'%')
+		</if>
+		<if test="pd.INSPECTION_USER_PHONE != null and pd.INSPECTION_USER_PHONE != ''">
+			and REPLACE(siu.PHONE,'/',',') LIKE CONCAT(CONCAT('%', #{pd.INSPECTION_USER_PHONE}),'%')
+		</if>
+		<if test="pd.INSPECTION_CASE != null and pd.INSPECTION_CASE != ''"><!-- 检查情况 -->
+			and biss.SITUATION like CONCAT('%', #{pd.INSPECTION_CASE}, '%')
+		</if>
 		GROUP BY f.INSPECTION_ID
 		ORDER BY f.CREATTIME DESC
 	</select>
@@ -668,7 +675,6 @@
                       ON si.INSPECTION_ID = f.INSPECTION_ID and si.ISDELETE = '0'
             LEFT JOIN vi_user_all siu ON siu.USER_ID = si.INSPECTION_USER_ID
             LEFT JOIN sys_dictionaries d ON d.BIANMA = f.INSPECTION_TYPE
-        <if test="pd.loginUserId != null and pd.loginUserId != ''">
             LEFT JOIN (select h.FOREIGN_ID, count(h.HIDDEN_ID) as `count`
                        from BUS_HIDDEN h
                        where h.ISDELETE = 0
@@ -676,7 +682,6 @@
                          and h.STATE in ('4', '8')
                          and (h.FINAL_CHECK is null or h.FINAL_CHECK = '2')
                        group by h.FOREIGN_ID) h on h.FOREIGN_ID = f.INSPECTION_ID AND f.INSPECTION_STATUS in ('5', '6')
-        </if>
         where f.ISDELETE = '0'
         <if test="pd.INSPECTION_ORIGINATOR_ID != null and pd.INSPECTION_ORIGINATOR_ID != ''">
             <!-- 检查发起人 -->
@@ -741,14 +746,11 @@
                 )
         </if>
         GROUP BY f.INSPECTION_ID
-        ORDER BY
+        ORDER BY CASE
-        <if test="pd.loginUserId != null and pd.loginUserId != ''">
-            CASE
                      WHEN f.INSPECTION_STATUS IN ('3', '4') AND f.INSPECTED_SITEUSER_ID = #{pd.loginUserId} THEN 1
                      WHEN f.INSPECTION_STATUS IN ('5', '6', '7') AND checkout = 1 THEN 2
                      ELSE 3
                      END,
-        </if>
                  field(f.INSPECTION_STATUS, '3', '6', '4', '7', '5', '0', '1', '2', '8', '-1', '-2'),
                  f.INSPECTION_TIME_END DESC
     </select>