Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/zcloud/controller/check/StopListManagerController.java

@@ -381,6 +381,7 @@ public class StopListManagerController extends BaseController {
 		pd = this.getPageData();
 		pd.put("OPERATOR", Jurisdiction.getUsername());    //修改人
 		pd.put("OPERATTIME", DateUtil.date2Str(new Date()));    //修改时间
+		pd.put("LISTMANAGER_ID",pd.getString("ID"));
 		listmanagerService.enable(pd);
 		map.put("result", errInfo);				//返回结果
 		return map;

src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomController.java

@@ -593,7 +593,7 @@ public class CustomController extends BaseController {
      * @throws Exception
      */
     @RequestMapping(value = "/deleteAll")
-    @RequiresPermissions("listmanager:del")
+//    @RequiresPermissions("listmanager:del")
     @ResponseBody
     @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单管理", instructionsType = "批量删除")
     public Object deleteAll() throws Exception {

src/main/java/com/zcloud/service/hiddenDangerCheckStandard/CustomService.java

@@ -55,6 +55,19 @@ public interface CustomService {
 	 */
 	void enable(PageData pd)throws Exception;
 
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void edit(PageData pd)throws Exception;
+	public List<PageData> stoplist(Page page)throws Exception;
+
+	/**部门清单列表
+	 * 	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> recordList(Page page)throws Exception;
+
 	/**通过id获取数据
 	 * @param pd
 	 * @throws Exception
@@ -93,10 +106,6 @@ public interface CustomService {
 	 */
 	List<PageData> getListByCorplistPage(Page page)throws Exception;
 
-	/**部门清单列表
+
-	 * 	 * @param pd
-	 * @throws Exception
-	 */
-	List<PageData> recordList(Page page)throws Exception;
 }
 

src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomServiceImpl.java

@@ -80,6 +80,27 @@ public class CustomServiceImpl implements CustomService {
 		customMapper.enable(pd);
 	}
 
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void edit(PageData pd)throws Exception{
+		customMapper.edit(pd);
+	}
+
+	public List<PageData> stoplist(Page page)throws Exception{
+		return customMapper.stopdatalistPage(page);
+	}
+
+	/**部门清单列表
+	 * 	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> recordList(Page page)throws Exception{
+		return customMapper.recordlistPage(page);
+	}
+
+
 	/**通过id获取数据
 	 * @param pd
 	 * @throws Exception
@@ -126,13 +147,7 @@ public class CustomServiceImpl implements CustomService {
 		return customMapper.getListByCorplistPage(page);
 	}
 
-	/**部门清单列表
+
-	 * 	 * @param pd
-	 * @throws Exception
-	 */
-	public List<PageData> recordList(Page page)throws Exception{
-		return customMapper.recordlistPage(page);
-	}
 }
 
 

src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomCheckRecordMapper.xml

@@ -1293,7 +1293,7 @@
 		set
 			ISSTATISTICS= #{ISSTATISTICS}
 		where
-			LISTMANAGER_ID = #{LISTMANAGER_ID}
+			CUSTOM_ID = #{CUSTOM_ID}
 			AND
 			DATE_FORMAT( CHECK_TIME, '%Y-%m-%d ' ) between DATE_FORMAT( #{STARTTIME}, '%Y-%m-%d' ) AND DATE_FORMAT( #{ENDTIME}, '%Y-%m-%d' )
 			AND

src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml

@@ -159,6 +159,142 @@
 		</if>
 		order by f.ISDELETE,f.OPERATTIME desc
 	</select>
+
+	<!-- 列表 -->
+	<select id="stopdatalistPage" parameterType="page" resultType="pd">
+		select
+		<include refid="Field"></include>
+		,
+		p.NAME PERIODNAME,
+		t.NAME TYPENAME,
+		d.NAME as DEPARTMENT_NAME,
+		getFullName(d.DEPARTMENT_ID) as DEPARTMENT_NAME_ALL,
+		sp.NAME
+		AS POST_NAME,
+		u.NAME USER_NAME,
+		bb.NAME as TASK_TYPE_NAME,
+		s.NAME AS SCREENTYPENAME,
+		(select count(1) from bus_hiddendangercheckstandard_custom_item ch where
+		ch.CUSTOM_ID=f.CUSTOM_ID and ch.ISDELETE = '0') as count ,
+		(SELECT count(1) FROM bus_hiddendangercheckstandard_checkrecord ch WHERE ch.CUSTOM_ID =
+		f.CUSTOM_ID AND ch.FINISHED = '1' AND ch.ISDELETE = 0 ) as
+		cdcount
+		from
+		<include refid="tableName"></include>
+		f
+		left join sys_dictionaries p on f.PERIOD = p.BIANMA
+		left join sys_dictionaries t on f.TYPE = t.BIANMA
+		left join sys_dictionaries s on f.SCREENTYPE = s.BIANMA
+		left join sys_dictionaries bb on f.TASK_TYPE = bb.DICTIONARIES_ID
+		left join OA_DEPARTMENT d on d.DEPARTMENT_ID=f.DEPARTMENT_ID
+		left join
+		SYS_POST sp on sp.POST_ID=f.POST_ID
+		left join sys_user u on u.USER_ID =
+		f.USER_ID
+		where f.CORPINFO_ID = #{pd.CORPINFO_ID}
+		and f.ISDELETE = '2'
+
+		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
+			and
+			(
+			f.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+			)
+		</if>
+		<if test="pd.POST_ID != null and pd.POST_ID != ''"><!-- 关键词检索 -->
+			and
+			(
+			f.POST_ID = #{pd.POST_ID}
+			)
+		</if>
+		<choose>
+			<when test='pd.ISMAIN != null and pd.ISMAIN != "" and pd.ISMAIN == "1"'>
+				<if test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
+					and
+					f.DEPARTMENT_ID in
+					<foreach item="item" index="index"
+							 collection="pd.DEPT_IDS" open="(" separator="," close=")">
+						'${item}'
+					</foreach>
+				</if>
+			</when>
+			<otherwise>
+				<choose>
+					<when test='pd.ISSUPERVISE != null and pd.ISSUPERVISE != "" and pd.ISSUPERVISE == "1"'>
+						<choose>
+							<when test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
+								and
+								f.DEPARTMENT_ID in
+								<foreach item="item" index="index"
+										 collection="pd.DEPT_IDS" open="(" separator="," close=")">
+									'${item}'
+								</foreach>
+							</when>
+							<otherwise>
+								and
+								(f.DEPARTMENT_ID in (
+								select
+								SUB_DEPARTMENT_ID
+								from
+								oa_supervision_department osd
+								where
+								osd.SUP_DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
+								and osd.ISDELETE = '0'
+								and osd.CORPINFO_ID  = #{pd.CORPINFO_ID}
+								)or f.USER_ID = #{pd.USER_ID})
+							</otherwise>
+						</choose>
+					</when>
+					<when test='pd.ISLEADER != null and pd.ISLEADER != "" and pd.ISLEADER == "1"'>
+						<choose>
+							<when test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
+								and
+								f.DEPARTMENT_ID in
+								<foreach item="item" index="index"
+										 collection="pd.DEPT_IDS" open="(" separator="," close=")">
+									'${item}'
+								</foreach>
+							</when>
+							<otherwise>
+								and
+								f.DEPARTMENT_ID in
+								<foreach item="item" index="index"
+										 collection="pd.DEPARTMENT_IDS" open="(" separator="," close=")">
+									'${item}'
+								</foreach>
+							</otherwise>
+						</choose>
+					</when>
+					<when test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">
+						and f.DEPARTMENT_ID=#{pd.DEPARTMENT_ID}
+					</when>
+					<otherwise>
+					</otherwise>
+				</choose>
+			</otherwise>
+		</choose>
+		<if test="pd.USERNAME != null and pd.USERNAME != ''"><!-- 关键词检索 -->
+			and u.NAME LIKE CONCAT(CONCAT('%', #{pd.USERNAME}),'%')
+		</if>
+		<if test="pd.TYPE != null and pd.TYPE != ''"><!-- 关键词检索 -->
+			and f.TYPE = #{pd.TYPE}
+		</if>
+		<if test="pd.LISTINGLEVEL != null and pd.LISTINGLEVEL != ''"><!-- 关键词检索 -->
+			<choose>
+				<when test='pd.LISTINGLEVEL == "1"'>
+					and d.LEVEL = ''
+				</when>
+				<otherwise>
+					and d.LEVEL = #{pd.LISTINGLEVEL}
+				</otherwise>
+			</choose>
+		</if>
+		<if
+				test="pd.RISKCHECKLISTTYPE != null and pd.RISKCHECKLISTTYPE != ''"><!-- 关键词检索 -->
+			and f.SCREENTYPE = #{pd.RISKCHECKLISTTYPE}
+		</if>
+		order by f.ISDELETE,f.OPERATTIME,f.DEPARTMENT_ID desc
+	</select>
+
 	<!-- 列表(全部) -->
 	<select id="datalistPage" parameterType="page" resultType="pd">
 		select
@@ -285,6 +421,57 @@
 		where
 		CUSTOM_ID = #{CUSTOM_ID}
 	</update>
+	<update id="edit" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+		NAME = #{NAME},
+		PERIOD = #{PERIOD},
+		TYPE = #{TYPE},
+		ACOUNT = #{ACOUNT},
+		BCOUNT = #{BCOUNT},
+		CCOUNT = #{CCOUNT},
+		DCOUNT = #{DCOUNT},
+		<if test="BAO_BAO_DEPARTMENT_ID != null or BAO_BAO_DEPARTMENT_ID != ''">
+			BAO_BAO_DEPARTMENT_ID = #{BAO_BAO_DEPARTMENT_ID},
+		</if>
+		<if test="ISDELETE != null or ISDELETE != ''">
+			ISDELETE = #{ISDELETE},
+		</if>
+		<if test="BAO_BAO_USER_ID != null or BAO_BAO_USER_ID != ''">
+			BAO_BAO_USER_ID = #{BAO_BAO_USER_ID},
+		</if>
+		<if test="BAO_BAO_TYPE != null or BAO_BAO_TYPE != ''">
+			BAO_BAO_TYPE = #{BAO_BAO_TYPE},
+		</if>
+		<if test="TASK_TYPE != null or TASK_TYPE != ''">
+			TASK_TYPE = #{TASK_TYPE},
+		</if>
+		<if test="DEPARTMENT_ID != null or DEPARTMENT_ID != ''">
+			DEPARTMENT_ID= #{DEPARTMENT_ID},
+		</if>
+		<if test="POST_ID != null or POST_ID != ''">
+			POST_ID =#{POST_ID},
+		</if>
+		<if test="SCREENTYPE != null or SCREENTYPE != ''">
+			SCREENTYPE =#{SCREENTYPE},
+		</if>
+		<if test="START_DATE != null or START_DATE != ''">
+			START_DATE =#{START_DATE},
+		</if>
+		<if test="END_DATE != null or END_DATE != ''">
+			END_DATE =#{END_DATE},
+		</if>
+		<if test="OVERTIMENUM != null or OVERTIMENUM != ''">
+			OVERTIMENUM =#{OVERTIMENUM},
+		</if>
+		<if test="USER_ID != null or USER_ID!= ''">
+			USER_ID =#{USER_ID},
+		</if>
+		CUSTOM_ID = CUSTOM_ID
+		where
+		CUSTOM_ID = #{CUSTOM_ID}
+	</update>
 
 	<!-- 通过ID获取数据 -->
 	<select id="findById" parameterType="pd" resultType="pd">