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

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

@@ -30,7 +30,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
-import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
 import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
@@ -385,4 +384,18 @@ public class TEmployeeContractInfoController {
 		tEmployeeContractInfoService.exportAuditContractInfo(contractInfo, response);
 	}
 
+	/**
+	 * @param empIdCard 身份证
+	 * @param deptId 项目id
+	 * @Description: 通过身份证与项目id查询
+	 * @Author: hgw
+	 * @Date: 2023/3/9 14:30
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
+	 **/
+	@Operation(summary = "通过身份证与项目id查询", description = "通过身份证与项目id查询")
+	@PostMapping("/getContractByEmpIdCardAndDeptId")
+	public R<String> getContractByEmpIdCardAndDeptId(@RequestParam String empIdCard, @RequestParam String deptId) {
+		return tEmployeeContractInfoService.getContractByEmpIdCardAndDeptId(empIdCard, deptId);
+	}
+
 }

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

@@ -21,10 +21,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.EmpContractBusinessPageVo;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeContractExportAuditVO;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeContractExportVO;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractSearchVo;
-import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -107,4 +107,6 @@ public interface TEmployeeContractInfoMapper extends BaseMapper<TEmployeeContrac
 	List<EmpContractBusinessPageVo> getOtherContractBusinessInfo(@Param("empId")String empId, @Param("contractId")String contractId);
 
 	void updateContractChange(@Param("idCard")String empIdcard, @Param("deptNo")String deptNo, @Param("oldDeptNo")String odlDeptNo);
+
+	int getContractByEmpIdCardAndDeptId(@Param("empIdCard") String empIdCard, @Param("deptId") String deptId);
 }

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

@@ -184,4 +184,6 @@ public interface TEmployeeContractInfoService extends IService<TEmployeeContract
 
 	List<EmpContractBusinessPageVo> getOtherContractBusinessInfo(String empId, String contractId);
 
+	R<String> getContractByEmpIdCardAndDeptId(String mpIdCard, String deptId);
+
 }

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

@@ -1519,5 +1519,15 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 	public List<EmpContractBusinessPageVo> getOtherContractBusinessInfo(String empId, String contractId) {
 		return baseMapper.getOtherContractBusinessInfo(empId,contractId);
 	}
-	
+
+	@Override
+	public R<String> getContractByEmpIdCardAndDeptId(String mpIdCard, String deptId) {
+		int count = baseMapper.getContractByEmpIdCardAndDeptId(mpIdCard, deptId);
+		if (count >0) {
+			return R.ok();
+		} else {
+			return R.failed("未找到合同");
+		}
+	}
+
 }

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

@@ -790,4 +790,13 @@
 		    a.SUBJECT_UNIT=b.CUSTOMER_NAME
 		where a.EMP_IDCARD = #{idCard} and a.DEPT_NO = #{oldDeptNo} and a.IN_USE='0'  and b.DEPART_NO= #{deptNo}  and b.DELETE_FLAG='0';
 	</update>
+
+	<select id="getContractByEmpIdCardAndDeptId" resultType="java.lang.Integer">
+		select
+		       count(1)
+		from t_employee_contract_info e
+		where e.EMP_IDCARD = #{empIdCard} and e.SETTLE_DOMAIN = #{deptId}
+		  and e.DELETE_FLAG = '0' and e.IS_OBSOLETE = '0'
+		  and e.situation !='作废' and e.situation !='终止' and e.AUDIT_STATUS != 3
+	</select>
 </mapper>

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java

@@ -822,6 +822,10 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 								errorMessageList.add(new ErrorMessage((i + 2), SalaryConstants.TAX_MONTH_LENGTH));
 								continue;
 							}
+							if (bankMap.get(excel.getBankName()) == null) {
+								errorMessageList.add(new ErrorMessage((i + 2), SalaryConstants.BANK_NAME_ERROR));
+								continue;
+							}
 							String pre = this.checkNewEmpBankAndPhone(excel, true);
 							if (pre != null) {
 								errorMessageList.add(new ErrorMessage((i + 2), pre));

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java

@@ -569,4 +569,19 @@ public class TDispatchInfoController {
 		}
 		return new SocialAndFundReduceVo();
 	}
+
+	/**
+	 * @param importVo
+	 * @Description: 单个派增
+	 * @Author: hgw
+	 * @Date: 2023/3/10 15:35
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.Boolean>
+	 **/
+	@Operation(summary = "单个派增 权限：social_dispatchinfo_add", description = "单个派增")
+	@PostMapping("/dispatchAdd")
+	@PreAuthorize("@pms.hasPermission('social_dispatchinfo_add')")
+	public R<List<ErrorMessage>> dispatchAdd(@RequestBody TDispatchImportVo importVo) {
+		return tDispatchInfoService.dispatchAdd(importVo);
+	}
+
 }

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

@@ -100,4 +100,12 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
 	 **/
 	SocialAndFundReduceVo getSocialAndFundReduceInfo(String empId);
 
+	/**
+	 * @param importVo
+	 * @Description: 单个派增
+	 * @Author: hgw
+	 * @Date: 2023/3/10 15:46
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.util.List < com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage>>
+	 **/
+	R<List<ErrorMessage>> dispatchAdd(TDispatchImportVo importVo);
 }

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

@@ -30,7 +30,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysArea;
 import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AllUserNaVo;
+import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaVo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
@@ -47,6 +49,7 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.social.constants.DispatchConstants;
+import com.yifu.cloud.plus.v1.yifu.social.constants.PreDispatchConstants;
 import com.yifu.cloud.plus.v1.yifu.social.entity.*;
 import com.yifu.cloud.plus.v1.yifu.social.mapper.*;
 import com.yifu.cloud.plus.v1.yifu.social.service.TDispatchInfoService;
@@ -4826,4 +4829,44 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		return R.ok(errorMessageList);
 	}
 
+	private void initAreaMap(Map<String, SysArea> areaHashMap, Map<String, SysArea> areaIdMap, R<AreaVo> areaListR) {
+		AreaVo areaList = areaListR.getData();
+		if (null != areaList && !areaList.getSysAreaList().isEmpty()) {
+			for (SysArea area : areaList.getSysAreaList()) {
+				areaHashMap.put(area.getAreaName(), area);
+				areaIdMap.put(Integer.toString(area.getId()), area);
+			}
+		}
+	}
+
+	@Override
+	public R<List<ErrorMessage>> dispatchAdd(TDispatchImportVo importVo) {
+		YifuUser user = SecurityUtils.getUser();
+		if (null == user || null == user.getId()) {
+			return R.failed(CommonConstants.USER_FAIL);
+		}
+		List<ErrorMessage> errorMessageList = new ArrayList<>();
+		HashMap<String,SysArea> areaMap = new HashMap<>();
+		HashMap<String,SysArea> areaIdMap = new HashMap<>();
+		importVo.setRowIndex(CommonConstants.ONE_INT);
+		List<TDispatchImportVo> importVoList = new ArrayList<>();
+		importVoList.add(importVo);
+		// 如果档案地市空  只能用缴纳地封装，如果缴纳地有问题直接返回
+		if (null == importVo.getFileCity()) {
+			R<AreaVo> areaListR = upmsDaprUtils.getAreaListR();
+			if (null == areaListR || areaListR.getCode() != CommonConstants.SUCCESS) {
+				return R.failed(PreDispatchConstants.GET_AREA_INFO);
+			}
+			initAreaMap(areaMap, areaIdMap, areaListR);
+		}
+		//  档案地市没问题 开始派单处理
+		this.importTDispatchInfo(importVoList, errorMessageList, user, null, new HashMap<>());
+		if (errorMessageList.isEmpty()) {
+			return R.ok();
+		} else {
+			return R.failed(errorMessageList);
+		}
+
+	}
+
 }