feature-wzb :续签代办添加原因反馈类

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/FeedBackDetail.java

+package com.yifu.cloud.plus.v1.yifu.archives.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+
+@Data
+@TableName("feed_back_detail")
+public class FeedBackDetail implements Serializable {
+
+	/**
+	 * 主键
+	 */
+	@TableId(type = IdType.ASSIGN_ID)
+	private String id;
+
+	/**
+	 * 反馈人
+	 */
+	@Schema(description ="反馈人")
+	private String feedbackPerson;
+
+	/**
+	 * 反馈时间
+	 */
+	@Schema(description ="反馈时间")
+	private Date feedbackTime;
+
+	/**
+	 * 反馈原因
+	 */
+	@Schema(description ="反馈原因")
+	private String feedbackReason;
+
+	/**
+	 * 反馈详情
+	 */
+	@Schema(description ="反馈详情")
+	private String feedbackDetail;
+
+	/**
+	 * 续签代办表关联主键
+	 */
+	@Schema(description ="续签代办表关联主键")
+	private String contractAlertId;
+
+	private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmpContractAlert.java

@@ -269,6 +269,52 @@ public class TEmpContractAlert extends BaseEntity {
 	private String empPhone;
 
 
+	/**
+	 * 是否反馈
+	 */
+	@ExcelAttribute(name = "是否反馈" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("是否反馈")
+	@Schema(description = "是否反馈")
+	private Integer isFeedback;
+
+	/**
+	 * 反馈原因
+	 */
+	@ExcelAttribute(name = "未续签原因" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("未续签原因")
+	@Schema(description = "未续签原因")
+	private String feedbackReason;
+
+	/**
+	 * 详情
+	 */
+	@ExcelAttribute(name = "具体描述信息" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("具体描述信息")
+	@Schema(description = "具体描述信息")
+	private String feedbackDetail;
+
+
+	/**
+	 * 反馈人
+	 */
+	@ExcelAttribute(name = "反馈人" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("反馈人")
+	@Schema(description = "反馈人")
+	private String feedbackPerson;
+
+	/**
+	 * 反馈时间
+	 */
+	@ExcelAttribute(name = "反馈时间" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("反馈时间")
+	@Schema(description = "反馈时间")
+	private Date feedbackTime;
+
 	/**
 	 * 合同截止日期
 	 */

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/ChangeFeedBackAllVo.java

+package com.yifu.cloud.plus.v1.yifu.archives.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.HeadFontStyle;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ChangeFeedBackAllVo {
+	private String [] ids;
+
+	/**
+	 * 是否反馈
+	 */
+
+	private Integer isFeedback;
+
+	/**
+	 * 反馈原因
+	 */
+
+	@Schema(description = "未续签原因")
+	private String feedbackReason;
+
+	/**
+	 * 详情
+	 */
+
+	@Schema(description = "具体描述信息")
+	private String feedbackDetail;
+
+
+	/**
+	 * 反馈人
+	 */
+
+	@Schema(description = "反馈人")
+	private String feedbackPerson;
+
+	/**
+	 * 反馈时间
+	 */
+
+	@Schema(description = "反馈时间")
+	private Date feedbackTime;
+
+}

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpContractAlertController.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpContractAlert;
 import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpContractAlertService;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.ChangeFeedBackAllVo;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.ContractAlertSearchVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
@@ -55,6 +56,7 @@ public class TEmpContractAlertController {
     private final TEmpContractAlertService tEmpContractAlertService;
 	private final MenuUtil menuUtil;
 
+
     /**
      * 分页查询
      * @param page 分页对象
@@ -171,4 +173,33 @@ public class TEmpContractAlertController {
 	public R taskCreateContractAlert() {
 		return tEmpContractAlertService.taskCreateContractAlert();
 	}
+
+	/**
+	 * 批量反馈
+	 *
+	 * @author wzb
+	 * @param changeFeedBackAllVo
+	 * @return {@link R}
+	 */
+	@Operation(summary = "批量反馈", description = "批量反馈")
+	@PostMapping("/changeFeedbackAll")
+	public R<Boolean> changeFeedBackAll(@RequestBody ChangeFeedBackAllVo changeFeedBackAllVo) {
+		return  R.ok(tEmpContractAlertService.changeFeedBackAll(changeFeedBackAllVo));
+	}
+
+
+	/**
+	 * 获取反馈日志详情
+	 *
+	 * @author wzb
+	 * @param id
+	 * @return {@link R}
+	 */
+	@Operation(summary = "获取反馈日志详情", description = "获取反馈日志详情")
+	@GetMapping("/getFeedbackDetail/{id}" )
+	public R getFeedbackDetail(@PathVariable("id" ) String id) {
+		return R.ok(tEmpContractAlertService.getFeedbackDetail(id));
+	}
+
+
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/FeedBackDetailMapper.java

+package com.yifu.cloud.plus.v1.yifu.archives.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yifu.cloud.plus.v1.yifu.archives.entity.FeedBackDetail;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface FeedBackDetailMapper extends BaseMapper<FeedBackDetail> {
+
+	List<FeedBackDetail> getDetail(@Param("id") String id);
+
+}

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmpContractAlertMapper.java

@@ -19,7 +19,9 @@ package com.yifu.cloud.plus.v1.yifu.archives.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpContractAlert;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.ChangeFeedBackAllVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 员工合同续签待办
@@ -31,4 +33,6 @@ import org.apache.ibatis.annotations.Mapper;
 public interface TEmpContractAlertMapper extends BaseMapper<TEmpContractAlert> {
 
     void truncate();
+
+	boolean changeFeedBackAll(@Param("changeFeedBackAllVo") ChangeFeedBackAllVo changeFeedBackAllVo);
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmpContractAlertService.java

@@ -20,7 +20,9 @@ package com.yifu.cloud.plus.v1.yifu.archives.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.archives.entity.FeedBackDetail;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpContractAlert;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.ChangeFeedBackAllVo;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.ContractAlertSearchVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 
@@ -48,4 +50,11 @@ public interface TEmpContractAlertService extends IService<TEmpContractAlert> {
 	 **/
 	R<Boolean> taskCreateContractAlert();
 	
+
+	boolean changeFeedBackAll(ChangeFeedBackAllVo changeFeedBackAllVo);
+    
+
+	List<FeedBackDetail> getFeedbackDetail(String id);
+
+
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpContractAlertServiceImpl.java

@@ -16,6 +16,7 @@
  */
 package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
 
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.ArrayUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
@@ -27,15 +28,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.archives.constants.ArchivesConstants;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
-import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmpContractAlertMapper;
-import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractInfoMapper;
-import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeInfoMapper;
-import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeProjectMapper;
+import com.yifu.cloud.plus.v1.yifu.archives.mapper.*;
 import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpContractAlertService;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.ChangeFeedBackAllVo;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.ContractAlertSearchVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
+import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -62,6 +63,8 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
 
 	private final TEmployeeProjectMapper projectMapper;
 
+	private final FeedBackDetailMapper feedbackDetailMapper;
+
 	@Override
 	public IPage<TEmpContractAlert> pageDiy(Page page, ContractAlertSearchVo searchVo) {
 		LambdaQueryWrapper<TEmpContractAlert> wrapper = buildQueryWrapper(searchVo);
@@ -246,6 +249,9 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
 		if (Common.isNotNull(entity.getUnitNo())) {
 			wrapper.eq(TEmpContractAlert::getUnitNo, entity.getUnitNo());
 		}
+		if (Common.isNotNull(entity.getIsFeedback())){
+			wrapper.eq(TEmpContractAlert::getIsFeedback,entity.getIsFeedback());
+		}
 		return wrapper;
 	}
 	/**
@@ -303,6 +309,8 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
 		return R.ok();
 	}
 
+
+
 	private void initExistMap(Map<String, TEmpContractAlert> existMap) {
 		List<TEmpContractAlert> exists = baseMapper.selectList(Wrappers.<TEmpContractAlert>query());
 		if (Common.isNotNull(exists)){
@@ -403,4 +411,27 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
 		alert.setHandleStatus(CommonConstants.ZERO_STRING);
 		alertMap.put(alert.getEmpIdcard()+CommonConstants.DOWN_LINE_STRING+alert.getProjectNo(),alert);
 	}
+	@Override
+	public boolean changeFeedBackAll(ChangeFeedBackAllVo changeFeedBackAllVo) {
+		YifuUser user = SecurityUtils.getUser();
+		for (int i = 0; i < changeFeedBackAllVo.getIds().length; i++) {
+			FeedBackDetail feedbackDetail = new FeedBackDetail();
+			feedbackDetail.setFeedbackPerson(user.getNickname());
+			feedbackDetail.setFeedbackTime(DateTime.now());
+			feedbackDetail.setContractAlertId(changeFeedBackAllVo.getIds()[i]);
+			feedbackDetail.setFeedbackReason(changeFeedBackAllVo.getFeedbackReason());
+			feedbackDetail.setFeedbackDetail(changeFeedBackAllVo.getFeedbackDetail());
+		     feedbackDetailMapper.insert(feedbackDetail);
+		}
+		      changeFeedBackAllVo.setFeedbackPerson(user.getNickname());
+		      changeFeedBackAllVo.setFeedbackTime(DateTime.now());
+	             return  baseMapper.changeFeedBackAll(changeFeedBackAllVo);
+	}
+
+	@Override
+	public List<FeedBackDetail> getFeedbackDetail(String id) {
+		return feedbackDetailMapper.getDetail(id);
+	}
+
+
 }

yifu-archives/yifu-archives-biz/src/main/resources/mapper/FeedBackDetailMapper.xml

+<?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.yifu.cloud.plus.v1.yifu.archives.mapper.FeedBackDetailMapper">
+	<resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.archives.entity.FeedBackDetail">
+		<id column="id" jdbcType="VARCHAR" property="id" />
+		<result column="FEEDBACK_PERSON" jdbcType="VARCHAR" property="feedbackPerson" />
+		<result column="FEEDBACK_TIME" jdbcType="TIMESTAMP" property="feedbackTime" />
+		<result column="FEEDBACK_REASON" jdbcType="VARCHAR" property="feedbackReason" />
+		<result column="FEEDBACK_DETAIL" jdbcType="VARCHAR" property="feedbackDetail" />
+		<result column="CONTRACT_ALERT_ID" jdbcType="VARCHAR" property="contractAlertId" />
+	</resultMap>
+	<sql id="Base_Column_List">
+		id, FEEDBACK_PERSON, FEEDBACK_TIME, FEEDBACK_REASON, FEEDBACK_DETAIL, CONTRACT_ALERT_ID
+	</sql>
+
+	<select id="getDetail" resultType="com.yifu.cloud.plus.v1.yifu.archives.entity.FeedBackDetail">
+		SELECT *
+		FROM feed_back_detail a
+		where a.CONTRACT_ALERT_ID=#{id}
+		order by FEEDBACK_TIME DESC
+	</select>
+</mapper>

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmpContractAlertMapper.xml

@@ -50,10 +50,26 @@
 	  <result property="createName" column="CREATE_NAME"/>
 	  <result property="createTime" column="CREATE_TIME"/>
 	  <result property="updateTime" column="UPDATE_TIME"/>
+	  <result property="isFeedback" column="IS_FEEDBACK"/>
+	  <result property="feedbackReason" column="FEEDBACK_REASON"/>
+	  <result property="feedbackDetail" column="FEEDBACK_DATAIL"/>
 	  <result property="contractId" column="CONTRACT_ID"/>
 
+
   </resultMap>
     <update id="truncate">
 		TRUNCATE t_emp_contract_alert
 	</update>
+
+<update id="changeFeedBackAll"  parameterType="com.yifu.cloud.plus.v1.yifu.archives.vo.ChangeFeedBackAllVo">
+	update  t_emp_contract_alert a
+	set a.IS_FEEDBACK=#{changeFeedBackAllVo.isFeedback},a.FEEDBACK_REASON=#{changeFeedBackAllVo.feedbackReason},a.FEEDBACK_DETAIL=#{changeFeedBackAllVo.feedbackDetail},
+	a.FEEDBACK_PERSON=#{changeFeedBackAllVo.feedbackPerson},a.FEEDBACK_TIME=#{changeFeedBackAllVo.feedbackTime}
+	where a.ID in
+	<foreach item="idStr" index="index" collection="changeFeedBackAllVo.ids" open="(" separator="," close=")">
+		#{idStr}
+	</foreach>
+</update>
+
+
 </mapper>