Merge remote-tracking branch 'origin/develop' into develop

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

@@ -276,21 +276,18 @@ public class TEmployeeProject extends BaseEntity {
 	 * 商险状态（字典）
 	 */
 	@Schema(description = "商险状态（字典）")
-	@TableField(exist = false)
 	private Integer insuranceStatus;
 
 	/**
 	 * 社保状态（字典）
 	 */
 	@Schema(description = "社保状态（字典）")
-	@TableField(exist = false)
 	private Integer socialStatus;
 
 	/**
 	 * 公积金状态（字典）
 	 */
 	@Schema(description = "公积金状态（字典）")
-	@TableField(exist = false)
 	private Integer fundStatus;
 
 	/**

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

@@ -70,7 +70,6 @@ public class FddContractInfoController {
      */
     @Operation(summary = "分页查询", description = "分页查询")
     @GetMapping("/page" )
-    @PreAuthorize("@pms.hasPermission('demo_fddcontractinfo_get')" )
     public R getFddContractInfoPage(Page page, FddContractInfo fddContractInfo) {
         return R.ok(fddContractInfoService.page(page, Wrappers.query(fddContractInfo)));
     }
@@ -82,7 +81,6 @@ public class FddContractInfoController {
      */
     @Operation(summary = "通过id查询", description = "通过id查询：hasPermission('demo_fddcontractinfo_get')")
     @GetMapping("/{id}" )
-    @PreAuthorize("@pms.hasPermission('demo_fddcontractinfo_get')" )
     public R getById(@PathVariable("id" ) String id) {
         return R.ok(fddContractInfoService.getById(id));
     }

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

@@ -62,7 +62,6 @@ public class FddContractTemplateController {
      */
     @Operation(summary = "分页查询", description = "分页查询")
     @GetMapping("/page" )
-    @PreAuthorize("@pms.hasPermission('demo_fddcontracttemplate_get')" )
     public R getFddContractTemplatePage(Page page, FddContractTemplate fddContractTemplate) throws ApiException {
         return R.ok(fddContractTemplateService.getFddContractTemplatePage(page, fddContractTemplate));
     }
@@ -74,7 +73,6 @@ public class FddContractTemplateController {
      */
     @Operation(summary = "通过id查询", description = "通过id查询：hasPermission('demo_fddcontracttemplate_get')")
     @GetMapping("/{id}" )
-    @PreAuthorize("@pms.hasPermission('demo_fddcontracttemplate_get')" )
     public R getById(@PathVariable("id" ) String id) {
         return R.ok(fddContractTemplateService.getById(id));
     }

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

@@ -55,7 +55,6 @@ public class FddContractTemplateFileController {
      */
     @Operation(summary = "分页查询", description = "分页查询")
     @GetMapping("/page" )
-    @PreAuthorize("@pms.hasPermission('demo_fddcontracttemplatefile_get')" )
     public R getFddContractTemplateFilePage(Page page, FddContractTemplateFile fddContractTemplateFile) {
         return R.ok(fddContractTemplateFileService.page(page, Wrappers.query(fddContractTemplateFile)));
     }
@@ -68,7 +67,6 @@ public class FddContractTemplateFileController {
      */
     @Operation(summary = "通过id查询", description = "通过id查询：hasPermission('demo_fddcontracttemplatefile_get')")
     @GetMapping("/{id}" )
-    @PreAuthorize("@pms.hasPermission('demo_fddcontracttemplatefile_get')" )
     public R getById(@PathVariable("id" ) String id) {
         return R.ok(fddContractTemplateFileService.getById(id));
     }

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

@@ -60,7 +60,7 @@ public class TEmployeeLogController {
 	@GetMapping("/page")
 	@PreAuthorize("@pms.hasPermission('demo_temployeelog_get')")
 	public R<IPage<TEmployeeLog>> getTEmployeeLogPage(Page<TEmployeeLog> page, TEmployeeLog tEmployeeLog) {
-		return R.ok(tEmployeeLogService.page(page, Wrappers.query(tEmployeeLog)));
+		return R.ok(tEmployeeLogService.page(page, Wrappers.query(tEmployeeLog).orderByDesc(CommonConstants.CREATE_TIME)));
 	}
 
 
@@ -129,7 +129,7 @@ public class TEmployeeLogController {
 	@GetMapping("/getByEmpId")
 	public R<List<TEmployeeLog>> getByEmpId(@RequestParam String empId) {
 		return R.ok(tEmployeeLogService.list(Wrappers.<TEmployeeLog>query().eq("EMP_ID", empId)
-				.eq("TYPE", CommonConstants.ZERO_INT)));
+				.eq("TYPE", CommonConstants.ZERO_INT).orderByDesc(CommonConstants.CREATE_TIME)));
 	}
 
 	/**
@@ -142,7 +142,7 @@ public class TEmployeeLogController {
 	@GetMapping("/getByProjectId")
 	public R<List<TEmployeeLog>> getByProjectId(@RequestParam String projectId) {
 		return R.ok(tEmployeeLogService.list(Wrappers.<TEmployeeLog>query().eq("PROJECT_ID", projectId)
-				.eq("TYPE", CommonConstants.ONE_INT)));
+				.eq("TYPE", CommonConstants.ONE_INT).orderByDesc(CommonConstants.CREATE_TIME)));
 	}
 
 }

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

@@ -215,6 +215,7 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
 				TCustomerInfo tCustomerInfo = tCustomerInfoService.getOne(Wrappers.<TCustomerInfo>query().lambda().eq(TCustomerInfo::getId, settleDomain.getCustomerId()));
 				//查询项目档案
 				TEmployeeProject tEmployeeProject = employeeProjectMapper.selectOne(Wrappers.<TEmployeeProject>query().lambda().eq(TEmployeeProject::getDeptId, settleDomain.getId())
+						.eq(TEmployeeProject::getDeptNo,settleDomain.getDepartNo())
 						.eq(TEmployeeProject::getEmpIdcard, fddContractAttachInfo.getEmpIdcard()).eq(TEmployeeProject::getDeleteFlag, CommonConstants.ZERO_STRING));
 
 				//查询人员档案
@@ -280,6 +281,7 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
 						//更新人员档案
 						tEmployeeInfo.setEmpPhone(fddContractAttachInfo.getEmpPhone());
 						tEmployeeInfo.setEmpNatrue(fddContractTemplate.getType());
+						tEmployeeInfo.setProjectNum(CommonConstants.ONE_INT + employeeInfoCompare.getProjectNum());
 						employeeInfoService.updateById(tEmployeeInfo);
 						//保存操作记录
 						tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[0],tEmployeeProject.getId(),"",employeeInfoCompare,tEmployeeInfo);
@@ -321,7 +323,6 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
 						newTEmpProject.setUnitName(tCustomerInfo.getCustomerName());
 						newTEmpProject.setUnitNo(tCustomerInfo.getCustomerCode());
 						newTEmpProject.setContractType(fddContractTemplate.getType());
-						newTEmpProject.setDeleteFlag(CommonConstants.STATUS_NORMAL);
 						newTEmpProject.setStatus(CommonConstants.dingleDigitIntArray[0]);
 						newTEmpProject.setPost(fddContractAttachInfo.getPost());
 						newTEmpProject.setEmpNatrue(newEmployeeInfo.getEmpNatrue());

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

@@ -650,17 +650,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 	@Transactional
 	public void importContract(List<EmployeeContractVO> excelVOList, List<ErrorMessage> errorMessageList) {
 		/// 个性化校验逻辑
-		List<TEmployeeContractInfo> list = this.list();
 		ErrorMessage errorMsg;
 		EmployeeContractVO excel;
 		// 执行数据插入操作 组装
 		for (int i = 0; i < excelVOList.size(); i++) {
 			excel = excelVOList.get(i);
-			errorMsg = checkRes(excel, list);
-			if (Common.isNotNull(errorMsg)) {
-				errorMessageList.add(errorMsg);
-				continue;
-			}
 			// 存储
 			insertExcel(excel, errorMessageList);
 			errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.SAVE_SUCCESS));

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

@@ -40,7 +40,6 @@ import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectService;
 import com.yifu.cloud.plus.v1.yifu.archives.service.TSettleDomainService;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectVO;
-import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
@@ -48,9 +47,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-import org.springframework.cache.support.SimpleValueWrapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
@@ -565,6 +561,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 	 * 插入excel Pro
 	 */
 	private void insertExcelPro(EmployeeProjectVO excel,List<TEmployeeProject> proInsList) {
+
 		TEmployeeProject insTEmployeePro = new TEmployeeProject();
 		BeanUtil.copyProperties(excel, insTEmployeePro);
 		insTEmployeePro.setId(String.valueOf(UUID.randomUUID()).replaceAll("-",""));
@@ -573,6 +570,21 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 		//人员档案主表id先设置成空，后面更新id
 		insTEmployeePro.setEmpId(CommonConstants.EMPTY_STRING);
 
+		//获取项目和单位信息
+		TSettleDomain tSettleDomain = tSettleDomainService.getOne(Wrappers.<TSettleDomain>query().lambda()
+				.eq(TSettleDomain::getDepartNo,insTEmployeePro.getDeptNo()).eq(TSettleDomain::getDeleteFlag,CommonConstants.STATUS_NORMAL)
+				.eq(TSettleDomain::getStopFlag,CommonConstants.STATUS_NORMAL));
+		if (Common.isNotNull(tSettleDomain)) {
+			insTEmployeePro.setDeptId(tSettleDomain.getId());
+			insTEmployeePro.setDeptName(tSettleDomain.getDepartName());
+			TCustomerInfo tCustomerInfo = tCustomerInfoMapper.selectById(tSettleDomain.getCustomerId());
+			if(Common.isNotNull(tCustomerInfo)) {;
+				insTEmployeePro.setUnitId(tCustomerInfo.getId());
+				insTEmployeePro.setUnitNo(tCustomerInfo.getCustomerCode());
+				insTEmployeePro.setUnitName(tCustomerInfo.getCustomerName());
+			}
+		}
+
 		String empNO = getEmpNo(insTEmployeePro.getDeptNo());
 		insTEmployeePro.setEmpNo(empNO);
 		//员工编码生成规则
@@ -705,7 +717,8 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 		tEmployeeProject.setDeptNo(employeeInfo.getDeptNo());
 
 		TSettleDomain tSettleDomain = tSettleDomainService.getOne(Wrappers.<TSettleDomain>query().lambda()
-				.eq(TSettleDomain::getDepartNo,employeeInfo.getDeptNo()).eq(TSettleDomain::getDeleteFlag,CommonConstants.STATUS_NORMAL));
+				.eq(TSettleDomain::getDepartNo,employeeInfo.getDeptNo()).eq(TSettleDomain::getDeleteFlag,CommonConstants.STATUS_NORMAL)
+				.eq(TSettleDomain::getStopFlag,CommonConstants.STATUS_NORMAL));
 		if (Common.isNotNull(tSettleDomain)) {
 			tEmployeeProject.setDeptId(tSettleDomain.getId());
 			tEmployeeProject.setDeptName(tSettleDomain.getDepartName());

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

@@ -158,9 +158,9 @@
                   a.REMARK,
                   a.CONTRACT_STATUS,
 				  b.EMP_PHONE,
-				  b.INSURANCE_STATUS,
-				  b.SOCIAL_STATUS,
-				  b.FUND_STATUS,
+				  a.INSURANCE_STATUS,
+				  a.SOCIAL_STATUS,
+				  a.FUND_STATUS,
 				  b.FILE_PROVINCE,
 				  b.FILE_CITY,
 				  b.FILE_TOWN,
@@ -194,9 +194,9 @@
                   b.CREATE_NAME AS PROCREATE_NAME,
                   b.CREATE_TIME AS PROCREATE_TIME,
 				  b.EMP_PHONE,
-				  b.INSURANCE_STATUS,
-				  b.SOCIAL_STATUS,
-				  b.FUND_STATUS,
+				  a.INSURANCE_STATUS,
+				  a.SOCIAL_STATUS,
+				  a.FUND_STATUS,
 				  b.FILE_PROVINCE,
 				  b.FILE_CITY,
 				  b.FILE_TOWN,
@@ -349,13 +349,13 @@
 				AND b.EMP_PHONE = #{tEmployeeProject.empPhone}
 			</if>
 			<if test="tEmployeeProject.insuranceStatus != null">
-				AND b.INSURANCE_STATUS = #{tEmployeeProject.insuranceStatus}
+				AND a.INSURANCE_STATUS = #{tEmployeeProject.insuranceStatus}
 			</if>
 			<if test="tEmployeeProject.socialStatus != null">
-			    AND b.SOCIAL_STATUS = #{tEmployeeProject.socialStatus}
+			    AND a.SOCIAL_STATUS = #{tEmployeeProject.socialStatus}
 		    </if>
 			<if test="tEmployeeProject.fundStatus != null">
-				AND b.FUND_STATUS = #{tEmployeeProject.fundStatus}
+				AND a.FUND_STATUS = #{tEmployeeProject.fundStatus}
 		    </if>
 			<if test="tEmployeeProject.salaryStatus != null">
 				AND a.SALARY_STATUS = #{tEmployeeProject.salaryStatus}
@@ -456,13 +456,13 @@
 				AND b.EMP_PHONE = #{tEmployeeProject.empPhone}
 			</if>
 			<if test="tEmployeeProject.insuranceStatus != null">
-				AND b.INSURANCE_STATUS = #{tEmployeeProject.insuranceStatus}
+				AND a.INSURANCE_STATUS = #{tEmployeeProject.insuranceStatus}
 			</if>
 			<if test="tEmployeeProject.socialStatus != null">
-				AND b.SOCIAL_STATUS = #{tEmployeeProject.socialStatus}
+				AND a.SOCIAL_STATUS = #{tEmployeeProject.socialStatus}
 			</if>
 			<if test="tEmployeeProject.fundStatus != null">
-				AND b.FUND_STATUS = #{tEmployeeProject.fundStatus}
+				AND a.FUND_STATUS = #{tEmployeeProject.fundStatus}
 			</if>
 			<if test="tEmployeeProject.salaryStatus != null">
 				AND a.SALARY_STATUS = #{tEmployeeProject.salaryStatus}
@@ -599,7 +599,8 @@
 	<insert id="insertExcelEmpProject" parameterType="java.util.List">
 		insert into t_employee_project
 		(ID,EMP_ID,EMP_NATRUE,EMP_NAME,EMP_IDCARD,STATUS,PROJECT_STATUS,EMP_CODE,DEPT_NO,CONTRACT_TYPE,POST,EMP_NO,
-		TRY_PERIOD,ENJOIN_DATE,BANK_NAME,BANK_NO,BANK_SUB_NAME,DELETE_FLAG,CREATE_BY,CREATE_NAME,CREATE_TIME)
+		TRY_PERIOD,ENJOIN_DATE,BANK_NAME,BANK_NO,BANK_SUB_NAME,DELETE_FLAG,CREATE_BY,CREATE_NAME,CREATE_TIME,INSURANCE_STATUS
+		,SOCIAL_STATUS,FUND_STATUS)
 		VALUES
 		<foreach collection="list" item="item" index="index" separator=",">
 			(
@@ -623,7 +624,10 @@
 			#{item.deleteFlag,jdbcType=VARCHAR},
 			#{item.createBy,jdbcType=VARCHAR},
 			#{item.createName,jdbcType=VARCHAR},
-			now()
+			now(),
+			0,
+			0,
+			0
 			)
 		</foreach>
 	</insert>

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

@@ -258,7 +258,7 @@ public interface CommonConstants {
 	public static final String ZIP_TYPE = "zip";
 	int BATCH_COUNT = 100;
 	String IMPORT_DATA_ANALYSIS_ERROR = "数据导入解析异常，请检查表数据格式";
-    String CREATE_TIME = "create_time";
+    String CREATE_TIME = "CREATE_TIME";
 	String ID = "ID";
 	String PARAM_IS_NOT_ERROR = "传参异常，请检查参数";
 	int EXCEL_EXPORT_LIMIT = 60000;

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

@@ -33,7 +33,7 @@ public class ExcelAttributeConstants {
 
 
 	//员工合同类型
-	public static final String EMPLOYEE_CONTRACT_TYPE = "contract_type" ;
+	public static final String EMPLOYEE_CONTRACT_TYPE = "employee_contract_type" ;
 
 	//员工合同工时制 1标准工时 2 综合工时 3不定时工时制
 	public static final String WORKING_HOURS = "working_hours";