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

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

@@ -162,10 +162,10 @@ public class TPreEmpDisabilityInfo extends BaseEntity {
 	private String  settleDomain;
 
 	/**
-	 * 0删除作废1正常
+	 * 0正常1删除作废
 	 */
 	@TableLogic
-	@Schema(description ="0删除作废1正常")
+	@Schema(description ="0正常1删除作废")
 	private String deleteFlag;
 
 	/**

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

@@ -36,25 +36,25 @@ public class PreEmpMainDetailVo implements Serializable {
 	// 主表
 	private TPreEmpMain main;
 	// 预入职-员工不良记录表
-	private TPreEmpBadRecord tPreEmpBadRecord;
+	private TPreEmpBadRecord tpreEmpBadRecord;
 	// 预入职-紧急联络人
-	private TPreEmpContactInfo tPreEmpContactInfo;
+	private TPreEmpContactInfo tpreEmpContactInfo;
 	// 预入职-员工申明
-	private TPreEmpDeclaration tPreEmpDeclaration;
+	private TPreEmpDeclaration tpreEmpDeclaration;
 	// 预入职-员工伤残信息表
-	private TPreEmpDisabilityInfo tPreEmpDisabilityInfo;
+	private TPreEmpDisabilityInfo tpreEmpDisabilityInfo;
 	// 预入职-员工学历信息表
-	private TPreEmpEducation tPreEmpEducation;
+	private TPreEmpEducation tpreEmpEducation;
 	// 预入职-员工家庭信息表
-	private List<TPreEmpFamily> tPreEmpFamilyList;
+	private List<TPreEmpFamily> tpreEmpFamilyList;
 	// 预入职-人员档案表
-	private TPreEmployeeInfo tPreEmployeeInfo;
+	private TPreEmployeeInfo tpreEmployeeInfo;
 	// 预入职-项目档案表
-	private TPreEmployeeProject tPreEmployeeProject;
+	private TPreEmployeeProject tpreEmployeeProject;
 	// 预入职-员工职业资格信息表
-	private List<TPreEmpProfessionalQualification> tPreEmpProfessionalQualificationList;
+	private List<TPreEmpProfessionalQualification> tpreEmpProfessionalQualificationList;
 	// 预入职-员工工作履历信息表
-	private List<TPreEmpWorkRecording> tPreEmpWorkRecordingList;
+	private List<TPreEmpWorkRecording> tpreEmpWorkRecordingList;
 	// 预入职-9身份证 10 户口本；附件 21（预入职申明签名）；22（预入职确认签名）；23（预入职pdf文件)
 	private List<TAttaInfo> attaInfoList;
 

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

@@ -6,13 +6,17 @@ import com.yifu.cloud.plus.v1.yifu.archives.service.FileUploadService;
 import com.yifu.cloud.plus.v1.yifu.archives.service.TAttaInfoService;
 import com.yifu.cloud.plus.v1.yifu.archives.utils.QrCodeUtil;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.OSSUtil;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.FileVo;
+import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -20,6 +24,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
 
 @Service
 @RequiredArgsConstructor
@@ -64,6 +71,19 @@ public class FileUploadServiceImpl implements FileUploadService {
 			attaInfo.setRelationType(String.valueOf(type));
 			try {
 				attaInfo.setDomainId(domain);
+
+				Set<String> dbAuthsSet = new HashSet<>();
+				Collection<? extends GrantedAuthority> authorities = AuthorityUtils
+						.createAuthorityList(dbAuthsSet.toArray(new String[0]));
+				YifuUser user = new YifuUser("2", 1L, "", "预入职扫码",
+						"预入职扫码", "0", SecurityConstants.BCRYPT + "123456",
+						"12345678911", true, true, true,
+						true,
+						"1", authorities, "1",
+						null, null,
+						null);
+				attaInfo.setCreateBy(user.getId());
+				attaInfo.setCreateName(user.getNickname());
 				attaInfo = tAttaInfoService.add(attaInfo);
 			} catch (Exception e) {
 				log.error("OSS文件上传异常：" + e.getMessage());

yifu-archives/yifu-archives-biz/src/main/resources/application.yml

@@ -46,6 +46,10 @@ security:
         - /fdd/*
         - /temployeeinfo/getHcmEmpInfo
         - /temployeeinfo/getHcmEmpInfoList
+        - /tpreempmain/getByCardAndDeptId
+        - /tpreempmain/saveDraftPreEmpMain
+        - /tpreempmain/savePreEmpMain
+        - /tpreempmain/uploadFileReturnAtta
 
 
 

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

@@ -258,13 +258,52 @@
 	<!--list-->
 	<select id="getTPreEmpMainAllList" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TPreMainExportAllVO">
 		SELECT
-			a.status field1
-			,a.create_time field2
-			,'员工主码' field3
-			,a.emp_Natrue field4
-			,a.emp_name field5
-			,a.emp_idcard field6
+			case a.STATUS when '0' then '草稿' when '1' then '待完善' when '2' then '待审核' when '3' then '审核不通过' when '4' then '审核通过' else '-' end field1
+			,a.create_time field2,e.EMP_CODE field3,emp_natrue.label field4,a.emp_name field5,a.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
+			,politicalStatus.label field15,e.EMP_PHONE field16,e.EMP_EMAIL field17
+			,concat(ifnull(pi.AREA_NAME,''),ifnull(ci.AREA_NAME,''),ifnull(ti.AREA_NAME,'')) field18	,registype.label field19
+			,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,'-',p.BUSINESS_SECOND_TYPE,'-',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
+			,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
+			,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_pre_emp_main a
+		left join t_pre_employee_info e on a.id=e.PRE_MAIN_ID
+		left join view_sys_dict_item emp_natrue on emp_natrue.value=a.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 t_pre_employee_project p on a.id=p.PRE_MAIN_ID
+		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_pre_emp_contact_info ec on a.id=ec.PRE_MAIN_ID
+		left join t_pre_emp_education ee on a.id=ee.PRE_MAIN_ID
+		left join view_sys_dict_item education on education.value=ee.EDUCATION_NAME and education.type='education'
+		left join t_pre_emp_work_recording ew on a.id=ew.PRE_MAIN_ID
+		left join t_pre_emp_family ef on a.id=ef.PRE_MAIN_ID
+		left join t_pre_emp_professional_qualification ep on a.id=ep.PRE_MAIN_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_pre_emp_disability_info ed on a.id=ed.PRE_MAIN_ID
+		left join t_pre_emp_bad_record eb on a.id=eb.PRE_MAIN_ID
 		<where>
 			a.STATUS != '5'
 			<include refid="tPreEmpMain_where"/>

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierServiceImpl.java

@@ -1156,7 +1156,8 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
 															// 复核使用的
 															oldDetail = oldMap.get(detailPerson.getCertNum() + CommonConstants.DOWN_LINE_STRING
 																	+ detailPerson.getSocialSecurityAccount() + CommonConstants.DOWN_LINE_STRING
-																	+ detailPerson.getInsuranceType());
+																	+ detailPerson.getInsuranceType() + CommonConstants.DOWN_LINE_STRING
+																	+ detailPerson.getPayMonth());
 															if (oldDetail != null) {
 																detailPerson.setId(oldDetail.getId());
 																voList.add(detailPerson);