MVP1.6.6-预入职相关_优化保存

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

@@ -51,6 +51,15 @@ public class TPreEmpContactInfo extends BaseEntity {
 	@Schema(description = "id")
 	private String id;
 
+	/**
+	 * empId
+	 */
+	@ExcelAttribute(name = "empId", maxLength = 32)
+	@Length(max = 32, message = "empId不能超过32个字符")
+	@ExcelProperty("empId")
+	@Schema(description = "empId")
+	private String empId;
+
 	/**
 	 * 原ID——用来判断是否从档案查询带出的
 	 */

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

@@ -118,6 +118,8 @@ public class TMainExportAllVO {
 	private String field41;
 	@ExcelProperty(value = "毕业时间")
 	private String field42;
+
+	// 1主要工作经历
 	@ExcelProperty(value = "是否为首份工作")
 	private String field43;
 	@ExcelProperty(value = "工作单位")
@@ -128,18 +130,23 @@ public class TMainExportAllVO {
 	private String field46;
 	@ExcelProperty(value = "结束工作日期")
 	private String field47;
+
+	// 2主要家庭成员信息
 	@ExcelProperty(value = "成员姓名")
 	private String field48;
 	@ExcelProperty(value = "与本人关系")
 	private String field49;
 	@ExcelProperty(value = "手机号码")
 	private String field50;
+
+	// 3职业资格信息
 	@ExcelProperty(value = "是否有职业资格证书")
 	private String field51;
 	@ExcelProperty(value = "申报年度")
 	private String field52;
 	@ExcelProperty(value = "职业资格名称")
 	private String field53;
+
 	@ExcelProperty(value = "是否曾被认定为工伤")
 	private String field54;
 	@ExcelProperty(value = "是否有职业病")

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

@@ -64,6 +64,17 @@ public class TEmpProfessionalQualificationController {
     public R<IPage<TEmpProfessionalQualification>> getTEmpProfessionalQualificationPage(Page page, CertifySearchVo searchVo) {
         return R.ok(qualificationService.pageDiy(page, searchVo));
     }
+
+	/**
+     * 删除
+     * @return
+     */
+    @Operation(description = "删除")
+    @GetMapping("/deleteProfessionalByEmpId" )
+    public void deleteProfessionalByEmpId(@RequestParam String empId) {
+        qualificationService.deleteProfessionalByEmpId(empId);
+    }
+
 	/**
 	 * 不分页查询
 	 * @param searchVo 员工职业资格信息表

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

@@ -93,5 +93,8 @@ public interface TCompleteMonitorMapper extends BaseMapper<TCompleteMonitor> {
 	int getTEmpMainAllCount(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
 	// 导出详情使用 hgw 2024-6-26 11:05:41
 	List<TMainExportAllVO> getTEmpMainAllList(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
+	List<TMainExportAllVO> getTEmpMainAllListOneWork(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
+	List<TMainExportAllVO> getTEmpMainAllListTwoFamily(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
+	List<TMainExportAllVO> getTEmpMainAllListThreeProfessional(@Param("tCompleteMonitor") TCompleteMonitor tCompleteMonitor);
 
 }

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

@@ -32,4 +32,5 @@ import org.apache.ibatis.annotations.Param;
 public interface TEmpProfessionalQualificationMapper extends BaseMapper<TEmpProfessionalQualification> {
 
 	void deleteProfessionalByEmpId(@Param("empId") String empId);
+
 }

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

@@ -38,5 +38,7 @@ public interface TPreEmpProfessionalQualificationMapper extends BaseMapper<TPreE
 	 * @return
 	 */
 	List<TPreEmpProfessionalQualification> getTPreEmpProfessionalQualificationList(@Param("preMainId") String preMainId);
-	void deleteByMainId(@Param("preMainId") String preMainId);
+
+	// 删除
+	void deleteProfessionalByMainId(@Param("preMainId") String preMainId);
 }

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

@@ -43,6 +43,6 @@ public interface TPreEmpProfessionalQualificationService extends IService<TPreEm
 	 * @Date: 2024/6/27 16:26
 	 * @return: void
 	 **/
-	void deleteByMainId(String preMainId);
+	void deleteProfessionalByMainId(String preMainId);
 
 }

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

@@ -45,7 +45,7 @@ public class TPreEmpProfessionalQualificationServiceImpl extends ServiceImpl<TPr
 	}
 
 	@Override
-	public void deleteByMainId(String preMainId) {
-		baseMapper.deleteByMainId(preMainId);
+	public void deleteProfessionalByMainId(String preMainId) {
+		baseMapper.deleteProfessionalByMainId(preMainId);
 	}
 }

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

@@ -290,29 +290,6 @@
 		FROM t_complete_monitor a
 		left join t_employee_project p on a.DEPT_NO=p.DEPT_NO
 		left join t_employee_info e on p.EMP_ID=e.id
-		left join view_sys_dict_item emp_natrue on emp_natrue.value=e.EMP_NATRUE and emp_natrue.type='emp_natrue'
-		left join view_sys_dict_item emp_married on emp_married.value=e.EMP_MARRI_STATUS and emp_married.type='emp_married'
-		left join view_sys_dict_item nation on nation.value=e.EMP_NATIONAL and nation.type='emp_national'
-		left join view_sys_dict_item registype on registype.value=e.EMP_REGIS_TYPE and registype.type='emp_registype'
-		left join view_sys_dict_item politicalStatus on politicalStatus.value=e.POLITICAL_STATUS and politicalStatus.type='emp_political'
-		left join sys_area pi on pi.id=e.ID_PROVINCE
-		left join sys_area ci on ci.id=e.ID_CITY
-		left join sys_area ti on ti.id=e.ID_TOWN
-		left join sys_area pf on pf.id=e.FILE_PROVINCE
-		left join sys_area cf on cf.id=e.FILE_CITY
-		left join sys_area tf on tf.id=e.FILE_TOWN
-
-		left join view_sys_dict_item contractType on contractType.value=p.CONTRACT_TYPE and contractType.type='employee_contract_type'
-		left join view_sys_dict_item workingHours on workingHours.value=p.WORKING_HOURS and workingHours.type='working_hours'
-		left join t_emp_contact_info ec on e.id=ec.EMP_ID
-		left join t_emp_education ee on e.id=ee.EMP_ID
-		left join view_sys_dict_item education on education.value=ee.EDUCATION_NAME and education.type='education'
-		left join t_emp_work_recording ew on e.id=ew.EMP_ID
-		left join t_emp_family ef on e.id=ef.EMP_ID
-		left join t_emp_professional_qualification ep on e.id=ep.EMP_ID
-		left join view_sys_dict_item qualification_type on qualification_type.value=ep.QUALIFICATION_TYPE and qualification_type.type='qualification_type'
-		left join t_emp_disability_info ed on e.id=ed.EMP_ID
-		left join t_emp_bad_record eb on e.id=eb.EMP_ID
 		<where>
 			p.DELETE_FLAG = '0' and p.PROJECT_STATUS = 0
 			<include refid="tCompleteMonitor_where"/>
@@ -323,7 +300,7 @@
 	<select id="getTEmpMainAllList" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TMainExportAllVO">
 		SELECT
 		if(a.IS_COMPLETE=0,'是','否') field1
-		,p.create_time field2,e.EMP_CODE field3,emp_natrue.label field4,e.emp_name field5,e.emp_idcard field6
+		,DATE_FORMAT(p.create_time,'%Y-%m-%d') field2,e.EMP_CODE field3,emp_natrue.label field4,e.emp_name field5,e.emp_idcard field6
 		,if(e.EMP_SEX='2','女',if(e.EMP_SEX='1','男','-')) field7
 		,if(e.VALIDITY_END is null,'-',if(e.VALIDITY_END > '2999-12-30 00:00:00','长期','固定')) field8	,e.VALIDITY_END field9
 		,e.VALIDITY_END field10,e.EMP_BIRTHDAY field11,e.EMP_AGE field12	,emp_married.label field13,nation.label field14
@@ -332,21 +309,32 @@
 		,concat(ifnull(pf.AREA_NAME,''),ifnull(cf.AREA_NAME,''),ifnull(tf.AREA_NAME,'')) field20	,if(e.FILE_STATUS=0,'正常','已减档') field21
 		,e.CONTACT_ADDRESS field22,p.UNIT_NAME field23,p.DEPT_NAME field24
 		,concat(p.BUSINESS_PRIMARY_TYPE,'-',ifnull(p.BUSINESS_SECOND_TYPE,''),'-',ifnull(p.BUSINESS_THIRD_TYPE,'')) field25
-		,contractType.label field26	,workingHours.label field27,p.POST field28,p.ENJOIN_DATE field29
-		,p.TRY_PERIOD field30,p.EMP_LABEL field31
+		,eci.contract_name field26	,workingHours.label field27,eci.POST field28,eci.CONTRACT_START field29
+		,eci.TRY_PERIOD field30,p.EMP_LABEL field31
 		,ec.EMP_NAME field32,ec.RELATION_TYPE field33,ec.ADDRESS field34,ec.TEL field35
 		,ee.SCHOOL field36,ee.MAJOR field37,education.label field38,if(e.IS_COLLEGE=0,'否','是') field39
-		,if(ee.HIGH_IDENTIFICATION=0,'是','否') field40	,ee.ENTRY_DATE field41,ee.GRADUTION_DATE field42
-		,if(e.FIRST_WORK_FLAG=0,'是','否') field43,ew.WORK_UNIT field44,ew.WORK_JOB field45,ew.START_DATE field46,ew.END_DATE field47
-		,ef.FAMILY_NAME field48,ef.RELATIONSHIP_SELF field49,ef.CONTRACT_TEL field50
-		,if(e.HAVE_QUALIFICATION=0,'是','否') field51,ep.DECLARE_YEAR field52,qualification_type.label field53
+		,educationEmp.label field40	,ee.ENTRY_DATE field41,ee.GRADUTION_DATE field42
+
 		,if(ed.INJURY_IDENTIFICATION=0,'是','否') field54,if(ed.OCCUPATIONAL_DISEASE_FLAG=0,'是','否') field55	,ed.OCCUPATIONAL_DISEASE field56
 		,if(ed.INFECTIOUS_DISEASE_FLAG=0,'是','否') field57	,ed.INFECTIOUS_NAME field58	,if(ed.DISABILITY_FLAG=0,'是','否') field59
 		,ed.DISABILITY_NAME field60,ed.DISABILITY_LEVEL field61,if(ed.OTHER_FLAG=0,'是','否') field62,eb.REMARK field63
 		FROM t_complete_monitor a
 		left join t_employee_project p on a.DEPT_NO=p.DEPT_NO
+
+		left join (
+		select
+		SUBSTRING_INDEX(GROUP_CONCAT(c.contract_name ORDER BY c.audit_time_last desc),',',1) contract_name
+		,c.EMP_IDCARD,c.DEPT_NO
+		,SUBSTRING_INDEX(GROUP_CONCAT(c.CONTRACT_START ORDER BY c.audit_time_last desc),',',1) CONTRACT_START
+		,SUBSTRING_INDEX(GROUP_CONCAT(c.WORKING_HOURS ORDER BY c.audit_time_last desc),',',1) WORKING_HOURS
+		,SUBSTRING_INDEX(GROUP_CONCAT(c.POST ORDER BY c.audit_time_last desc),',',1) POST
+		,SUBSTRING_INDEX(GROUP_CONCAT(c.TRY_PERIOD ORDER BY c.audit_time_last desc),',',1) TRY_PERIOD
+		from t_employee_contract_info c where c.IN_USE='0' and c.delete_flag = '0' and c.audit_status = '2' GROUP BY c.EMP_IDCARD,c.DEPT_NO
+		) eci on p.EMP_IDCARD=eci.EMP_IDCARD and p.dept_no=eci.dept_no
+
 		left join t_employee_info e on p.EMP_ID=e.id
 		left join view_sys_dict_item emp_natrue on emp_natrue.value=e.EMP_NATRUE and emp_natrue.type='emp_natrue'
+		left join view_sys_dict_item educationEmp on educationEmp.value=e.HIGN_EDUCATION and educationEmp.type='education'
 		left join view_sys_dict_item emp_married on emp_married.value=e.EMP_MARRI_STATUS and emp_married.type='emp_married'
 		left join view_sys_dict_item nation on nation.value=e.EMP_NATIONAL and nation.type='emp_national'
 		left join view_sys_dict_item registype on registype.value=e.EMP_REGIS_TYPE and registype.type='emp_registype'
@@ -357,20 +345,74 @@
 		left join sys_area pf on pf.id=e.FILE_PROVINCE
 		left join sys_area cf on cf.id=e.FILE_CITY
 		left join sys_area tf on tf.id=e.FILE_TOWN
-
-		left join view_sys_dict_item contractType on contractType.value=p.CONTRACT_TYPE and contractType.type='employee_contract_type'
-		left join view_sys_dict_item workingHours on workingHours.value=p.WORKING_HOURS and workingHours.type='working_hours'
+		left join view_sys_dict_item workingHours on workingHours.value=eci.WORKING_HOURS and workingHours.type='working_hours'
 		left join t_emp_contact_info ec on e.id=ec.EMP_ID
-		left join t_emp_education ee on e.id=ee.EMP_ID
+		left join t_emp_education ee on e.id=ee.EMP_ID and ee.DELETE_FLAG = '0'
 		left join view_sys_dict_item education on education.value=ee.EDUCATION_NAME and education.type='education'
+		left join t_emp_disability_info ed on e.id=ed.EMP_ID and ed.DELETE_FLAG = '0'
+		left join t_emp_bad_record eb on e.id=eb.EMP_ID
+		<where>
+			p.DELETE_FLAG = '0' and p.PROJECT_STATUS = 0
+			<include refid="tCompleteMonitor_where"/>
+		</where>
+		<if test="tCompleteMonitor != null">
+			<if test="tCompleteMonitor.limitStart != null">
+				limit #{tCompleteMonitor.limitStart},#{tCompleteMonitor.limitEnd}
+			</if>
+		</if>
+	</select>
+
+	<!--导出统计list1主要工作经历-->
+	<select id="getTEmpMainAllListOneWork" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TMainExportAllVO">
+		SELECT
+		e.emp_idcard field6
+		,if(e.FIRST_WORK_FLAG is null,'',if(e.FIRST_WORK_FLAG=0,'是','否')) field43,ew.WORK_UNIT field44,ew.WORK_JOB field45,ew.START_DATE field46,ew.END_DATE field47
+		FROM t_complete_monitor a
+		left join t_employee_project p on a.DEPT_NO=p.DEPT_NO
+		left join t_employee_info e on p.EMP_ID=e.id
 		left join t_emp_work_recording ew on e.id=ew.EMP_ID
+		<where>
+			p.DELETE_FLAG = '0' and p.PROJECT_STATUS = 0 and ew.id is not null
+			<include refid="tCompleteMonitor_where"/>
+		</where>
+		<if test="tCompleteMonitor != null">
+			<if test="tCompleteMonitor.limitStart != null">
+				limit #{tCompleteMonitor.limitStart},#{tCompleteMonitor.limitEnd}
+			</if>
+		</if>
+	</select>
+
+	<!--导出统计list2主要家庭成员信息-->
+	<select id="getTEmpMainAllListTwoFamily" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TMainExportAllVO">
+		SELECT
+		e.emp_idcard field6
+		,ef.FAMILY_NAME field48,ef.RELATIONSHIP_SELF field49,ef.CONTRACT_TEL field50
+		FROM t_complete_monitor a
+		left join t_employee_project p on a.DEPT_NO=p.DEPT_NO
+		left join t_employee_info e on p.EMP_ID=e.id
 		left join t_emp_family ef on e.id=ef.EMP_ID
+		<where>
+			p.DELETE_FLAG = '0' and p.PROJECT_STATUS = 0 and ef.id is not null
+			<include refid="tCompleteMonitor_where"/>
+		</where>
+		<if test="tCompleteMonitor != null">
+			<if test="tCompleteMonitor.limitStart != null">
+				limit #{tCompleteMonitor.limitStart},#{tCompleteMonitor.limitEnd}
+			</if>
+		</if>
+	</select>
+	<!--导出统计list3职业资格信息-->
+	<select id="getTEmpMainAllListThreeProfessional" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TMainExportAllVO">
+		SELECT
+		e.emp_idcard field6
+		,if(e.HAVE_QUALIFICATION is null,'',if(e.HAVE_QUALIFICATION=0,'是','否')) field51,ep.DECLARE_YEAR field52,qualification_type.label field53
+		FROM t_complete_monitor a
+		left join t_employee_project p on a.DEPT_NO=p.DEPT_NO
+		left join t_employee_info e on p.EMP_ID=e.id
 		left join t_emp_professional_qualification ep on e.id=ep.EMP_ID
 		left join view_sys_dict_item qualification_type on qualification_type.value=ep.QUALIFICATION_TYPE and qualification_type.type='qualification_type'
-		left join t_emp_disability_info ed on e.id=ed.EMP_ID
-		left join t_emp_bad_record eb on e.id=eb.EMP_ID
 		<where>
-			p.DELETE_FLAG = '0' and p.PROJECT_STATUS = 0
+			p.DELETE_FLAG = '0' and p.PROJECT_STATUS = 0 and ep.id is not null
 			<include refid="tCompleteMonitor_where"/>
 		</where>
 		<if test="tCompleteMonitor != null">

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmpProfessionalQualification.xml → yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmpProfessionalQualificationMapper.xml

@@ -36,18 +36,17 @@
     <result property="assessmentUnit" column="ASSESSMENT_UNIT"/>
     <result property="declareYear" column="DECLARE_YEAR"/>
     <result property="heightIdentification" column="HEIGHT_IDENTIFICATION"/>
-	<result property="settleDomain" column="SETTLE_DOMAIN"/>
     <result property="deleteFlag" column="DELETE_FLAG"/>
+    <result property="settleDomain" column="SETTLE_DOMAIN"/>
     <result property="createBy" column="CREATE_BY"/>
     <result property="updateBy" column="UPDATE_BY"/>
     <result property="createName" column="CREATE_NAME"/>
     <result property="createTime" column="CREATE_TIME"/>
     <result property="updateTime" column="UPDATE_TIME"/>
-	<result property="remark" column="REMARK"/>
+    <result property="remark" column="REMARK"/>
   </resultMap>
-
+    <!--删除-->
 	<delete id="deleteProfessionalByEmpId">
-		delete from t_pre_emp_professional_qualification where EMP_ID = #{empId}
+		delete from t_emp_professional_qualification where EMP_ID = #{empId}
 	</delete>
-
 </mapper>

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

@@ -26,6 +26,7 @@
   <resultMap id="tPreEmpContactInfoMap" type="com.yifu.cloud.plus.v1.yifu.archives.entity.TPreEmpContactInfo">
     <id property="id" column="ID"/>
     <result property="preMainId" column="PRE_MAIN_ID"/>
+    <result property="empId" column="EMP_ID"/>
     <result property="empName" column="EMP_NAME"/>
 	<result property="empIdcard" column="EMP_IDCARD"/>
     <result property="relationType" column="RELATION_TYPE"/>
@@ -41,6 +42,7 @@
     <sql id="Base_Column_List">
                 a.ID,
                 a.PRE_MAIN_ID,
+                a.EMP_ID,
                 a.EMP_NAME,
                 a.EMP_IDCARD,
                 a.RELATION_TYPE,

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

@@ -146,7 +146,7 @@
 		where PRE_MAIN_ID = #{preMainId}
     </select>
 
-	<delete id="deleteByMainId">
+	<delete id="deleteProfessionalByMainId">
 		delete from t_pre_emp_professional_qualification where PRE_MAIN_ID = #{preMainId}
 	</delete>