Просмотр исходного кода

修改公出审核调整
修改切换打卡
新增多人审核

anderx 1 год назад
Родитель
Сommit
68e8c96a65

+ 16 - 0
src/main/java/com/goafanti/admin/bo/AdminPublicReviewerBo.java

@@ -0,0 +1,16 @@
+package com.goafanti.admin.bo;
+
+import com.goafanti.common.model.AdminPublicReviewer;
+
+public class AdminPublicReviewerBo extends AdminPublicReviewer {
+
+    private String reviewerName;
+
+    public String getReviewerName() {
+        return reviewerName;
+    }
+
+    public void setReviewerName(String reviewerName) {
+        this.reviewerName = reviewerName;
+    }
+}

+ 14 - 0
src/main/java/com/goafanti/admin/controller/AdminSuperviserApiController.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.admin.bo.AdminLocationBo;
+import com.goafanti.admin.bo.AdminPublicReviewerBo;
 import com.goafanti.admin.service.AdminLocationService;
 import com.goafanti.admin.service.NewAdminService;
 import com.goafanti.common.bo.Result;
@@ -320,6 +321,19 @@ public class AdminSuperviserApiController extends CertifyApiController {
 		res.setData(newAdminService.selectAllByid(id));
 		return res;
 	}
+
+	/**
+	 * 公出审核列表
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/publicReviewer", method = RequestMethod.GET)
+	public Result<List<AdminPublicReviewerBo>> publicReviewer(String id){
+		Result res = new Result();
+		res.setData(newAdminService.publicReviewer(id));
+		return res;
+	}
+
 	/**删除用户**/
 	@RequestMapping(value = "/deleteById", method = RequestMethod.POST)
 	public Result deleteById(String id){

+ 1 - 0
src/main/java/com/goafanti/admin/service/NewAdminService.java

@@ -71,4 +71,5 @@ public interface NewAdminService {
 
 	void pushRolesName(AdminListBo i);
 
+	Object publicReviewer(String id);
 }

+ 47 - 12
src/main/java/com/goafanti/admin/service/impl/NewAdminServiceImpl.java

@@ -2,38 +2,38 @@ package com.goafanti.admin.service.impl;
 
 import com.goafanti.admin.bo.AdminDetail;
 import com.goafanti.admin.bo.AdminListBo;
+import com.goafanti.admin.bo.AdminPublicReviewerBo;
 import com.goafanti.admin.service.NewAdminService;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.*;
-import com.goafanti.common.model.Admin;
-import com.goafanti.common.model.AmbSystem;
-import com.goafanti.common.model.Role;
-import com.goafanti.common.model.UserRole;
+import com.goafanti.common.model.*;
 import com.goafanti.common.utils.AsyncUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.*;
 
 @Service
 public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements NewAdminService {
-	@Autowired
+	@Resource
 	private AdminMapper			adminMapper;
-	@Autowired
+	@Resource
 	private UserRoleMapper		userRoleMapper;
-	@Autowired
+	@Resource
 	private AdminLocationMapper	adminLocationMapper;
-	@Autowired
+	@Resource
 	private AmbSystemMapper	ambSystemMapper;
-	@Autowired
+	@Resource
 	private RoleMapper	roleMapper;
-	@Autowired
+	@Resource
 	private AsyncUtils asyncUtils;
+	@Resource
+	private AdminPublicReviewerMapper adminPublicReviewerMapper;
 
 	@Override
 	public Pagination<AdminListBo> listAdmin(AdminListBo alb, String rid,String roleName,Integer pageNo, Integer pageSize) {
@@ -72,6 +72,13 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 	}
 
 	@Override
+	public Object publicReviewer(String id) {
+		List<AdminPublicReviewerBo> list = adminPublicReviewerMapper.selectByAid(id);
+		list.stream().filter(AdminPublicReviewer::getType==1)
+		return list;
+	}
+
+	@Override
 	public List<Admin> selectAllAdmin() {
 		return adminMapper.selectAllAdmin(null);
 	}
@@ -111,7 +118,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 		//
 		asyncUtils.pushRoleUpdateExamine(ad,useAdmin,roleIds,useRole);
 		//修改公出审核人
-		updatePublicReviewer(ad.getId(),reviewerIds);
+		if(reviewerIds!=null)updatePublicReviewer(ad.getId(),reviewerIds);
 		pushAmbRole(ad);
 		if (count>0&&ad.getAmbId()!=null){
 			//进行巴人数计算
@@ -126,6 +133,34 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 
 	private void updatePublicReviewer(String aid ,String reviewerIds) {
 		String[] split = reviewerIds.split(",");
+		List<AdminPublicReviewerBo> list = adminPublicReviewerMapper.selectByAid(aid);
+		//
+		for (AdminPublicReviewerBo e : list) {
+			boolean flag = false;
+			for (String s : split) {
+				if (e.getReviewerId().equals(s)){
+					flag = true;
+				}
+			}
+			if (!flag){
+				adminPublicReviewerMapper.deleteById(e.getId());
+			}
+		}
+		for (String s : split) {
+			boolean flag = false;
+			for (AdminPublicReviewerBo e : list) {
+				if (e.getReviewerId().equals(s)){
+					flag = true;
+				}
+			}
+			if (!flag){
+				AdminPublicReviewer adminPublicReviewer = new AdminPublicReviewer();
+				adminPublicReviewer.setAid(aid);
+				adminPublicReviewer.setReviewerId(s);
+				adminPublicReviewer.setCreateTime(new Date());
+				adminPublicReviewerMapper.insert(adminPublicReviewer);
+			}
+		}
 
 	}
 

+ 6 - 2
src/main/java/com/goafanti/common/dao/AdminPublicReviewerMapper.java

@@ -1,16 +1,18 @@
+package com.goafanti.common.dao;
+import com.goafanti.admin.bo.AdminPublicReviewerBo;
 import com.goafanti.common.model.AdminPublicReviewer;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 
-;
+
 
 /**
  * 管理员公出审核人表(AdminPublicReviewer)表数据库访问层
  *
  * @author makejava
- * @since 2024-07-09 11:41:53
+ * @since 2024-07-09 14:20:42
  */
 public interface AdminPublicReviewerMapper {
 
@@ -82,5 +84,7 @@ public interface AdminPublicReviewerMapper {
      */
     int deleteById(Integer id);
 
+    List<AdminPublicReviewerBo> selectByAid(String aid);
+
 }
 

+ 26 - 8
src/main/java/com/goafanti/common/mapper/AdminPublicReviewerMapper.xml

@@ -5,6 +5,7 @@
     <resultMap type="com.goafanti.common.model.AdminPublicReviewer" id="AdminPublicReviewerMap">
         <result property="id" column="id" jdbcType="INTEGER"/>
         <result property="aid" column="aid" jdbcType="VARCHAR"/>
+        <result property="type" column="type" jdbcType="INTEGER"/>
         <result property="reviewerId" column="reviewer_id" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
     </resultMap>
@@ -12,7 +13,7 @@
     <!--查询单个-->
     <select id="queryById" resultMap="AdminPublicReviewerMap">
         select
-id, aid, reviewer_id, create_time
+id, aid, type, reviewer_id, create_time
         from admin_public_reviewer
         where id = #{id}
     </select>
@@ -20,7 +21,7 @@ id, aid, reviewer_id, create_time
     <!--查询指定行数据-->
     <select id="findAdminPublicReviewerList" resultMap="AdminPublicReviewerMap">
         select
-id, aid, reviewer_id, create_time
+id, aid, type, reviewer_id, create_time
         from admin_public_reviewer
         <where>
             <if test="id != null">
@@ -29,6 +30,9 @@ id, aid, reviewer_id, create_time
             <if test="aid != null and aid != ''">
                 and aid = #{aid}
             </if>
+            <if test="type != null">
+                and type = #{type}
+            </if>
             <if test="reviewerId != null and reviewerId != ''">
                 and reviewer_id = #{reviewerId}
             </if>
@@ -50,6 +54,9 @@ id, aid, reviewer_id, create_time
             <if test="aid != null and aid != ''">
                 and aid = #{aid}
             </if>
+            <if test="type != null">
+                and type = #{type}
+            </if>
             <if test="reviewerId != null and reviewerId != ''">
                 and reviewer_id = #{reviewerId}
             </if>
@@ -61,26 +68,27 @@ id, aid, reviewer_id, create_time
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into admin_public_reviewer(aid, reviewer_id, create_time)
-        values (#{aid}, #{reviewerId}, #{createTime})
+        insert into admin_public_reviewer(aid, type, reviewer_id, create_time)
+        values (#{aid}, #{type}, #{reviewerId}, #{createTime})
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into admin_public_reviewer(aid, reviewer_id, create_time)
+        insert into admin_public_reviewer(aid, type, reviewer_id, create_time)
         values
         <foreach collection="entities" item="entity" separator=",">
-        (#{entity.aid}, #{entity.reviewerId}, #{entity.createTime})
+        (#{entity.aid}, #{entity.type}, #{entity.reviewerId}, #{entity.createTime})
         </foreach>
     </insert>
 
     <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into admin_public_reviewer(aid, reviewer_id, create_time)
+        insert into admin_public_reviewer(aid, type, reviewer_id, create_time)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.aid}, #{entity.reviewerId}, #{entity.createTime})
+            (#{entity.aid}, #{entity.type}, #{entity.reviewerId}, #{entity.createTime})
         </foreach>
         on duplicate key update
 aid = values(aid),
+type = values(type),
 reviewer_id = values(reviewer_id),
 create_time = values(create_time)
     </insert>
@@ -92,6 +100,9 @@ create_time = values(create_time)
             <if test="aid != null and aid != ''">
                 aid = #{aid},
             </if>
+            <if test="type != null">
+                type = #{type},
+            </if>
             <if test="reviewerId != null and reviewerId != ''">
                 reviewer_id = #{reviewerId},
             </if>
@@ -106,6 +117,13 @@ create_time = values(create_time)
     <delete id="deleteById">
         delete from admin_public_reviewer where id = #{id}
     </delete>
+    <select id="selectByAid"  resultType="com.goafanti.admin.bo.AdminPublicReviewerBo">
+        select
+            a.id, a.aid, a.reviewer_id as reviewerId, a.create_time as createTime,
+            b.name as reviewerName
+        from admin_public_reviewer a left join admin b on a.reviewer_id=b.id
+        where aid = #{aid}
+    </select>
 
 </mapper>
 

+ 5 - 2
src/main/java/com/goafanti/common/model/AdminPublicReviewer.java

@@ -1,5 +1,7 @@
 package com.goafanti.common.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -8,10 +10,10 @@ import java.util.Date;
  * 管理员公出审核人表(AdminPublicReviewer)实体类
  *
  * @author makejava
- * @since 2024-07-09 11:41:53
+ * @since 2024-07-09 14:20:42
  */
 public class AdminPublicReviewer implements Serializable {
-    private static final long serialVersionUID = -70042855604763861L;
+    private static final long serialVersionUID = 883328960230907242L;
 
     private Integer id;
 /**
@@ -52,6 +54,7 @@ public class AdminPublicReviewer implements Serializable {
         this.reviewerId = reviewerId;
     }
 
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     public Date getCreateTime() {
         return createTime;
     }