八项作业前端更新

2023-12-13 14:35:16 +08:00 · 2023-12-13 14:35:16 +08:00 · d55fd86916
parent e3b7a14601
commit d55fd86916
6 changed files with 461 additions and 1 deletions
--- a/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java
+++ b/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java
@ -32,7 +32,9 @@ import java.util.*;
@RequestMapping("/app/gfHighwork")
 public class AppGFHighWorkController extends BaseController {

-	@Resource
+	@Autowired
+	private GFHighWorkAcceptUserService highworkacceptuserService;
+	@Autowired
 	private GFHighWorkService GFhighworkService;
 	@Resource
 	private GFHighWorkLogService GFhighWorkLogService;
--- a/src/main/java/com/zcloud/controller/gf/GFHighWorkController.java
+++ b/src/main/java/com/zcloud/controller/gf/GFHighWorkController.java
@ -3,6 +3,7 @@ package com.zcloud.controller.gf;
 import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
+import com.zcloud.service.gf.GFHighWorkAcceptUserService;
 import com.zcloud.service.gf.GFHighWorkService;
 import com.zcloud.util.Jurisdiction;
 import com.zcloud.util.ObjectExcelView;
@ -31,6 +32,8 @@ public class GFHighWorkController extends BaseController {

 	@Autowired
 	private GFHighWorkService GFhighworkService;
+	@Autowired
+	private GFHighWorkAcceptUserService highworkacceptuserService;

 	/**新增
 	 * @param
@ -129,6 +132,8 @@ public class GFHighWorkController extends BaseController {
 		pd = GFhighworkService.findById(pd);	//根据ID读取
 		map.put("pd", pd);
 		map.put("measuresList", GFhighworkService.listAllMeasures(pd));
+		map.put("imgList",highworkacceptuserService.findByIds(pd));
+		map.put("imgList1",highworkacceptuserService.findById(pd));
 		map.put("result", errInfo);
 		return map;
 	}
--- a/src/main/java/com/zcloud/mapper/datasource/gf/GFHighWorkAcceptUserMapper.java
+++ b/src/main/java/com/zcloud/mapper/datasource/gf/GFHighWorkAcceptUserMapper.java
@ -0,0 +1,67 @@
+package com.zcloud.mapper.datasource.gf;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+
+import java.util.List;
+
+/**
+ * 说明：图片管理
+ * 作者：luoxiaobao
+ * 时间：2020-12-24
+ * 官网：www.zcloudchina.com
+ */
+public interface GFHighWorkAcceptUserMapper {
+
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	void save(PageData pd);
+
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	void delete(PageData pd);
+
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	void deleteList(PageData pd);
+
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	void edit(PageData pd);
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	List<PageData> datalistPage(Page page);
+
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	List<PageData> listAll(PageData pd);
+
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	List<PageData> findById(PageData pd);
+	List<PageData> findByIds(PageData pd);
+
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	void deleteAll(String[] ArrayDATA_IDS);
+	List<PageData> listAllByIds(PageData pd);
+
+}
+
--- a/src/main/java/com/zcloud/service/gf/GFHighWorkAcceptUserService.java
+++ b/src/main/java/com/zcloud/service/gf/GFHighWorkAcceptUserService.java
@ -0,0 +1,67 @@
+package com.zcloud.service.gf;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+
+import java.util.List;
+
+/**
+ * 说明：图片管理
+ * 作者：luoxiaobao
+ * 时间：2020-12-24
+ * 官网：www.zcloudchina.com
+ */
+public interface GFHighWorkAcceptUserService {
+
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void save(PageData pd)throws Exception;
+
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void delete(PageData pd)throws Exception;
+
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void deleteList(PageData pd)throws Exception;
+
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void edit(PageData pd)throws Exception;
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	public List<PageData> list(Page page)throws Exception;
+
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> listAll(PageData pd)throws Exception;
+
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> findById(PageData pd)throws Exception;
+	public List<PageData> findByIds(PageData pd)throws Exception;
+
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
+
+	public List<PageData> listAllByIds(PageData pd)throws Exception;
+}
+
--- a/src/main/java/com/zcloud/service/gf/impl/GFHighWorkAcceptUserServiceImpl.java
+++ b/src/main/java/com/zcloud/service/gf/impl/GFHighWorkAcceptUserServiceImpl.java
@ -0,0 +1,102 @@
+package com.zcloud.service.gf.impl;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.mapper.datasource.gf.GFHighWorkAcceptUserMapper;
+import com.zcloud.service.gf.GFHighWorkAcceptUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 说明：图片管理
+ * 作者：luoxiaobao
+ * 时间：2020-12-24
+ * 官网：www.zcloudchina.com
+ */
+@Service
+@Transactional //开启事物
+public class GFHighWorkAcceptUserServiceImpl implements GFHighWorkAcceptUserService {
+
+	@Autowired
+	private GFHighWorkAcceptUserMapper highworkacceptuserMapper;
+
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void save(PageData pd)throws Exception{
+		highworkacceptuserMapper.save(pd);
+	}
+
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void delete(PageData pd)throws Exception{
+		highworkacceptuserMapper.delete(pd);
+	}
+
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void deleteList(PageData pd)throws Exception{
+		highworkacceptuserMapper.deleteList(pd);
+	}
+
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void edit(PageData pd)throws Exception{
+		highworkacceptuserMapper.edit(pd);
+	}
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	public List<PageData> list(Page page)throws Exception{
+		return highworkacceptuserMapper.datalistPage(page);
+	}
+
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> listAll(PageData pd)throws Exception{
+		return highworkacceptuserMapper.listAll(pd);
+	}
+
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> findById(PageData pd)throws Exception{
+		return highworkacceptuserMapper.findById(pd);
+	}
+	public List<PageData> findByIds(PageData pd)throws Exception{
+		return highworkacceptuserMapper.findByIds(pd);
+	}
+
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
+		highworkacceptuserMapper.deleteAll(ArrayDATA_IDS);
+	}
+
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> listAllByIds(PageData pd)throws Exception{
+		return highworkacceptuserMapper.listAllByIds(pd);
+	}
+
+}
+
--- a/src/main/resources/mybatis/datasource/gf/HighWorkAcceptUserMapper.xml
+++ b/src/main/resources/mybatis/datasource/gf/HighWorkAcceptUserMapper.xml
@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zcloud.mapper.datasource.gf.GFHighWorkAcceptUserMapper">
+
+
+	<!--表名 -->
+	<sql id="tableName">
+		GF_HIGHWORK_ACCEPTUSER
+	</sql>
+
+	<!--数据字典表名 -->
+	<sql id="dicTableName">
+		SYS_DICTIONARIES
+	</sql>
+
+	<sql id="Field">
+		f.ACCEPT_CONFESS_ID,
+		f.HIGHWORK_ID,
+		f.CORPINFO_ID,
+		f.ISDELETE,
+		f.OPERATTIME,
+		f.OPERATOR,
+		f.ACCEPT_CONFESS_DEPARTMENT_ID,
+		f.ACCEPT_CONFESS_USER_ID,
+		f.ACCEPT_CONFESS_USER_SIGNER_PATH,
+		f.ACCEPT_CONFESS_USER_SIGNER_TIME,
+		f.ISSELF,
+		f.ACCEPT_USER_ID,
+		f.ACCEPT_USER_SIGNER_PATH,
+		f.ACCEPT_USER_SIGNER_TIME,
+		f.ACCEPT_DEPARTMENT_ID
+	</sql>
+
+	<!-- 字段用于新增 -->
+	<sql id="Field2">
+		ACCEPT_CONFESS_ID,
+		HIGHWORK_ID,
+		CORPINFO_ID,
+		ISDELETE,
+		OPERATTIME,
+		OPERATOR,
+		ACCEPT_CONFESS_DEPARTMENT_ID,
+		ACCEPT_CONFESS_USER_ID,
+		ACCEPT_CONFESS_USER_SIGNER_PATH,
+		ACCEPT_CONFESS_USER_SIGNER_TIME,
+		ISSELF,
+		ACCEPT_USER_ID,
+		ACCEPT_USER_SIGNER_PATH,
+		ACCEPT_USER_SIGNER_TIME,
+		ACCEPT_DEPARTMENT_ID
+
+	</sql>
+
+	<!-- 字段值 -->
+	<sql id="FieldValue">
+		#{ACCEPT_CONFESS_ID},
+		#{HIGHWORK_ID},
+		#{CORPINFO_ID},
+		#{ISDELETE},
+		#{OPERATTIME},
+		#{OPERATOR},
+		#{ACCEPT_CONFESS_DEPARTMENT_ID},
+		#{ACCEPT_CONFESS_USER_ID},
+		#{ACCEPT_CONFESS_USER_SIGNER_PATH},
+		#{ACCEPT_CONFESS_USER_SIGNER_TIME},
+		#{ISSELF},
+		#{ACCEPT_USER_ID},
+		#{ACCEPT_USER_SIGNER_PATH},
+		#{ACCEPT_USER_SIGNER_TIME},
+		#{ACCEPT_DEPARTMENT_ID}
+	</sql>
+
+	<!-- 新增-->
+	<insert id="save" parameterType="pd">
+		insert into
+	<include refid="tableName"></include>
+		(
+	<include refid="Field2"></include>
+		) values (
+	<include refid="FieldValue"></include>
+		)
+	</insert>
+
+	<!-- 删除-->
+	<delete id="delete" parameterType="pd">
+		delete from
+		<include refid="tableName"></include>
+		where
+		ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID}
+	</delete>
+
+
+
+	<!-- 修改 -->
+	<update id="edit" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+			ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID},
+			HIGHWORK_ID = #{HIGHWORK_ID},
+			CORPINFO_ID = #{CORPINFO_ID},
+			OPERATTIME = #{OPERATTIME},
+			OPERATOR = #{OPERATOR},
+			ACCEPT_CONFESS_DEPARTMENT_ID = #{ACCEPT_CONFESS_DEPARTMENT_ID},
+			ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID},
+			ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH},
+			ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME},
+			ISSELF = #{ISSELF}
+		where
+			ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID}
+	</update>
+
+	<!-- 通过ID获取数据 -->
+	<select id="findById" parameterType="pd" resultType="pd">
+		select
+		f.ACCEPT_CONFESS_ID,
+		f.HIGHWORK_ID,
+		f.CORPINFO_ID,
+		f.ISDELETE,
+		f.OPERATTIME,
+		f.OPERATOR,
+		f.ACCEPT_USER_ID,
+		f.ACCEPT_USER_SIGNER_PATH,
+		f.ACCEPT_USER_SIGNER_TIME,
+		f.ACCEPT_DEPARTMENT_ID
+		from
+		<include refid="tableName"></include> f
+		where
+		f.HIGHWORK_ID = #{HIGHWORK_ID} and f.CORPINFO_ID = #{CORPINFO_ID} and f.ACCEPT_USER_ID = #{ACCEPT_USER_ID}
+		order by f.ACCEPT_USER_SIGNER_TIME asc
+	</select>
+	<select id="findByIds" parameterType="pd" resultType="pd">
+		select
+		f.ACCEPT_CONFESS_ID,
+		f.HIGHWORK_ID,
+		f.CORPINFO_ID,
+		f.ISDELETE,
+		f.OPERATTIME,
+		f.OPERATOR,
+		f.ACCEPT_CONFESS_DEPARTMENT_ID,
+		f.ACCEPT_CONFESS_USER_ID,
+		f.ACCEPT_CONFESS_USER_SIGNER_PATH,
+		f.ACCEPT_CONFESS_USER_SIGNER_TIME
+		from
+		<include refid="tableName"></include> f
+		where
+		f.HIGHWORK_ID = #{HIGHWORK_ID} and f.CORPINFO_ID = #{CORPINFO_ID} and f.ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID}
+		order by f.ACCEPT_CONFESS_USER_SIGNER_TIME asc
+	</select>
+
+	<!-- 列表 -->
+	<select id="datalistPage" parameterType="page" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+		where f.ISDELETE = '0'
+		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
+			and
+				(
+				<!--	根据需求自己加检索条件
+					字段1 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+					 or
+					字段2 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+				-->
+				)
+		</if>
+	</select>
+
+	<!-- 列表(全部) -->
+	<select id="listAll" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+		where 1=1
+		<if test="ISSELF != null and ISSELF != ''"><!-- 关键词检索 -->
+			and
+				f.ISSELF=#{ISSELF}
+		</if>
+		<if test="HIGHWORK_ID != null and HIGHWORK_ID != ''"><!-- 关键词检索 -->
+			and
+				f.HIGHWORK_ID=#{HIGHWORK_ID}
+		</if>
+	</select>
+
+	<!-- 批量删除 -->
+	<delete id="deleteAll" parameterType="String">
+		update
+		<include refid="tableName"></include>
+		set
+			ISDELETE = '1'
+		where
+		ACCEPT_CONFESS_ID in
+		<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
+                 #{item}
+		</foreach>
+	</delete>
+
+	<!-- 列表 -->
+	<select id="listAllByIds" parameterType="String" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+		where 1=1
+		<if test="ArrayDATA_IDS != null and ArrayDATA_IDS != ''"><!-- 关键词检索 -->
+			and f.ACCEPT_CONFESS_ID in
+			<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
+	                 #{item}
+			</foreach>
+		</if>
+
+
+	</select>
+
+</mapper>