Merge remote-tracking branch 'origin/MVP1.6.10' into MVP1.6.10

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

@@ -80,4 +80,15 @@ public class TAttaInfo  extends BaseEntity {
 	@Schema(description = "地址URL")
 	@TableField(exist = false)
 	private String attaUrl;
+	/**
+	 * 附件变更类型：0 增加  1 减少。 档案编辑附件时需要告知后端是增加还是减少
+	 */
+	@TableField(exist = false)
+	private String handleType;
+
+	/**
+	 * 其他分租名称
+	 */
+	@TableField(exist = false)
+	private String groupName;
 }

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

@@ -77,5 +77,10 @@ public class TEmpOtherFile {
 	// 附件
 	@TableField(exist = false)
 	private List<TAttaInfo> attaList;
+	/**
+	 * 档案编辑其他附件分租信息处理类型 0 新增 1 更新 2 删除
+	 */
+	@TableField(exist = false)
+	private String handleType;
 
 }

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

@@ -561,4 +561,10 @@ public class TEmployeeInfo extends BaseEntity {
 	@ExcelAttribute(name = "是否有职业资格证书",isNotEmpty = true,isDataId = true, readConverterExp = "0=是,1=否")
 	@Schema(description ="是否有职业资格证书:0 是  1 否")
 	private String haveQualification;
+
+	/**
+	 * 其他附件--C段二维码扫码数据
+	 */
+	@TableField(exist = false)
+	private List<TEmpOtherFile> otherFiles;
 }

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

@@ -34,4 +34,18 @@ public class TCompleteMonitorInfoVo implements Serializable {
 	@Schema(description = "人员档案id")
 	private String empInfoId;
 
+	@Schema(description = "项目编码")
+	private String deptNo;
+
+	/**
+	 * 开始时间（查询专用）
+	 */
+	@Schema(description = "进项目时间开始")
+	private LocalDateTime inTimeStart;
+	/**
+	 * 截止时间（查询专用）
+	 */
+	@Schema(description = "进项目时间结束")
+	private LocalDateTime inTimeEnd;
+
 }

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

@@ -70,13 +70,13 @@ public class TCompleteMonitorController {
 	/**
 	 * 查询人员明细
 	 * @param page 分页对象
-	 * @param deptNo 查询人员明细
+	 * @param completeMonitorInfoVo
 	 * @return
 	 */
 	@Operation(description = "根据项目查询人员明细")
 	@GetMapping("/empPage")
-	public R<IPage<TCompleteMonitorInfoVo>> getMonitorEmpInfoListPage(Page<TCompleteMonitorInfoVo> page, String deptNo) {
-		return new R<>(tCompleteMonitorService.getMonitorEmpInfoListPage(page,deptNo));
+	public R<IPage<TCompleteMonitorInfoVo>> getMonitorEmpInfoListPage(Page<TCompleteMonitorInfoVo> page, TCompleteMonitorInfoVo completeMonitorInfoVo) {
+		return new R<>(tCompleteMonitorService.getMonitorEmpInfoListPage(page,completeMonitorInfoVo));
 	}
 
     /**

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

@@ -142,7 +142,7 @@ public class TEmployeeInfoController {
 	@Operation(summary = "通过id查询", description = "通过id查询")
 	@GetMapping("/{id}")
 	public R<TEmployeeInfo> getById(@PathVariable("id") String id) {
-		return R.ok(tEmployeeInfoService.getById(id));
+		return tEmployeeInfoService.getByIdAssociate(id);
 	}
 
 	/**
@@ -531,4 +531,18 @@ public class TEmployeeInfoController {
 		tEmployeeInfoService.updateEmployeeAgeTask();
 	}
 
+	/**
+	 * @Author fxj
+	 * @Description 人员档案附件信息导出
+	 * @Date 15:15 2024/9/10
+	 * @Param
+	 * @return
+	**/
+	@Operation(summary = "导出人员档案附件信息ZIP包", description = "导出人员档案附件信息ZIP包")
+	@SysLog("导出人员档案附件信息ZIP包")
+	@PostMapping("/exportEmployeeFile/{id}")
+	public void exportEmployeeFile(@PathVariable("id") String id, HttpServletResponse response) throws Exception{
+		tEmployeeInfoService.exportEmployeeFile(id, response);
+	}
+
 }

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

@@ -60,10 +60,10 @@ public interface TCompleteMonitorMapper extends BaseMapper<TCompleteMonitor> {
 
 	/**
 	 * 查询人员明细
-	 * @param deptNo 项目编码
+	 * @param completeMonitorInfoVo
 	 * @return
 	 */
-	IPage<TCompleteMonitorInfoVo> getMonitorEmpInfoList(Page<TCompleteMonitorInfoVo> page,@Param("deptNo") String deptNo);
+	IPage<TCompleteMonitorInfoVo> getMonitorEmpInfoList(Page<TCompleteMonitorInfoVo> page,@Param("completeMonitorInfoVo") TCompleteMonitorInfoVo completeMonitorInfoVo);
 
 	/**
 	 * 获取所有监控数据

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

@@ -55,10 +55,10 @@ public interface TCompleteMonitorService extends IService<TCompleteMonitor> {
 
 	/**
 	 * 档案完整度监控简单分页查询
-	 * @param deptNo 项目编码
+	 * @param completeMonitorInfoVo
 	 * @return
 	 */
-	IPage<TCompleteMonitorInfoVo> getMonitorEmpInfoListPage(Page<TCompleteMonitorInfoVo> page, String deptNo);
+	IPage<TCompleteMonitorInfoVo> getMonitorEmpInfoListPage(Page<TCompleteMonitorInfoVo> page, TCompleteMonitorInfoVo completeMonitorInfoVo);
 
 	// 导出全量
 	void exportAll(HttpServletResponse response, TCompleteMonitorSearchVo searchVo);

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

@@ -92,13 +92,13 @@ public interface TEmployeeInfoService extends IService<TEmployeeInfo> {
 	R<String> addNewEmployee(TEmployeeInfo employeeInfo);
 
 	/**
-	 * @param employeeInfo
+	 * @param tEmployeeInfo
 	 * @Description: 更新档案信息
 	 * @Author: hgw
 	 * @Date: 2022/6/21 19:29
 	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.Boolean>
 	 **/
-	R<Boolean> updateEmployee(TEmployeeInfo employeeInfo);
+	R<Boolean> updateEmployee(TEmployeeInfo tEmployeeInfo);
 
 	/**
 	 * @param id
@@ -256,4 +256,8 @@ public interface TEmployeeInfoService extends IService<TEmployeeInfo> {
 	void updateEmployeeAgeTask();
 
 	IPage<TEmployeeInfo> getPageAsso(Page<TEmployeeInfo> page, TEmployeeInfo tEmployeeInfo);
+
+	R<TEmployeeInfo> getByIdAssociate(String id);
+
+	void exportEmployeeFile(String id, HttpServletResponse response) throws Exception;
 }

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

@@ -180,12 +180,12 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
 
 	/**
 	 * 档案完整度监控简单分页查询
-	 * @param deptNo 项目编码
+	 * @param completeMonitorInfoVo
 	 * @return
 	 */
 	@Override
-	public IPage<TCompleteMonitorInfoVo> getMonitorEmpInfoListPage(Page<TCompleteMonitorInfoVo> page, String deptNo){
-		return baseMapper.getMonitorEmpInfoList(page,deptNo);
+	public IPage<TCompleteMonitorInfoVo> getMonitorEmpInfoListPage(Page<TCompleteMonitorInfoVo> page, TCompleteMonitorInfoVo completeMonitorInfoVo){
+		return baseMapper.getMonitorEmpInfoList(page,completeMonitorInfoVo);
 	}
 
 	@Override

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

@@ -1447,7 +1447,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 				employee.setEmpPhone(vo.getMobile());
 			}
 			if(Common.isEmpty(vo.getFlag())){
-				employee.setIsCollege(CommonConstants.ONE_INT);
+				employee.setIsCollege(CommonConstants.ZERO_INT);
 				if (Common.isNotNull(vo.getHighEducation())) {
 					employee.setHignEducation(vo.getHighEducation());
 					if ("5".equals(employee.getHignEducation())

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

@@ -150,7 +150,27 @@
 		from
 			t_employee_project a
 			left join t_employee_info b on a.EMP_ID = b.id
-		where a.DELETE_FLAG = '0' and a.project_status = 0 and a.dept_no = #{deptNo} order by a.CREATE_TIME desc
+		where a.DELETE_FLAG = '0'
+		  and a.project_status = 0
+		<if test="completeMonitorInfoVo.deptNo != null and completeMonitorInfoVo.deptNo.trim() != ''">
+			and a.dept_no = #{completeMonitorInfoVo.deptNo}
+		</if>
+		<if test="completeMonitorInfoVo.empName != null and completeMonitorInfoVo.empName.trim() != ''">
+			and a.EMP_NAME = #{completeMonitorInfoVo.empName}
+		</if>
+		<if test="completeMonitorInfoVo.phone != null and completeMonitorInfoVo.phone.trim() != ''">
+			and a.EMP_PHONE = #{completeMonitorInfoVo.phone}
+		</if>
+		<if test="completeMonitorInfoVo.isComplete != null and completeMonitorInfoVo.isComplete.trim() != ''">
+			and a.IS_COMPLETE = #{completeMonitorInfoVo.isComplete}
+		</if>
+		<if test="completeMonitorInfoVo.inTimeStart != null">
+			AND a.CREATE_TIME <![CDATA[ >= ]]> #{completeMonitorInfoVo.inTimeStart}
+		</if>
+		<if test="completeMonitorInfoVo.inTimeEnd != null">
+			AND a.CREATE_TIME <![CDATA[ <= ]]> #{completeMonitorInfoVo.inTimeEnd}
+		</if>
+		order by a.CREATE_TIME desc
 	</select>
 
 	<!--生成数据封装-->

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

@@ -1201,7 +1201,7 @@
 			<if test="tEmployeeInfo.major != null">MAJOR=#{tEmployeeInfo.major},</if>
 			<if test="tEmployeeInfo.gradutionDate != null">GRADUTION_DATE=#{tEmployeeInfo.gradutionDate},</if>
 			<if test="tEmployeeInfo.contactAddress != null">CONTACT_ADDRESS=#{tEmployeeInfo.contactAddress},</if>
-			<if test="tEmployeeInfo.isCollege != null">IS_COLLEGE='1',</if>
+			<if test="tEmployeeInfo.isCollege != null">IS_COLLEGE=#{tEmployeeInfo.isCollege},</if>
 			<if test="tEmployeeInfo.fileProvince != null">a.FILE_PROVINCE=#{tEmployeeInfo.fileProvince},</if>
 			<if test="tEmployeeInfo.fileCity != null">a.FILE_CITY=#{tEmployeeInfo.fileCity},</if>
 			<if test="tEmployeeInfo.fileCity != null">

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java

@@ -146,6 +146,16 @@ public interface CommonConstants {
 
 	String SIXTEEN_STRING = "16";
 
+	String TWENTY_TWO_STRING = "22";
+
+	String TWENTY_THREE_STRING = "23";
+
+	String TWENTY_FOUR_STRING = "24";
+
+	String TWENTY_FIVE_STRING = "25";
+
+	String TWENTY_SEVEN_STRING = "27";
+
 	public static final String DEFAULT_PASSWORD = "123456";
 
 	/**
@@ -507,7 +517,7 @@ public interface CommonConstants {
 
 	public static final String TWENTY_STRING = "20";
 
-	public static final int TWENTY_ONE_STRING = 21;
+	public static final String TWENTY_ONE_STRING = "21";
 
 	public static final String ERROR_MSG_PRFIX = "error=";