工资兼容订单接口

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

@@ -110,7 +110,7 @@ public class FileUploadController {
 		}
 		for (TAttaInfo  atta:attas){
 			URL url = ossUtil.getObjectUrl(null, atta.getAttaSrc());
-			atta.setAttaUrl(url.toString());
+			atta.setAttaUrl(url.toString().replace("http","https"));
 		}
 		return new R<>(attas);
 	}

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryAttaController.java

@@ -117,7 +117,7 @@ public class TSalaryAttaController {
 			return R.failed("无对应附件信息");
 		}
 		URL url = ossUtil.getObjectUrl(null, salaryAtta.getAttaSrc());
-		salaryAtta.setAttaUrl(url.toString());
+		salaryAtta.setAttaUrl(url.toString().replace("http","https"));
 		return new R<>(salaryAtta);
 	}
 

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

@@ -150,14 +150,6 @@ public class THaveSalaryNosocialServiceImpl extends ServiceImpl<THaveSalaryNosoc
         for (TSettleDomainSelectVo selectVo : domainListVoR.getData().getListSelectVO()) {
             settleDomainSelectVoMap.put(selectVo.getId(),selectVo);
         }
-        //其获取所有用户
-        R<AllUserNaVo> allUserVoR = upmsDaprUtils.getAllUserName();
-        Map<String,String> allUserDTOMap=Maps.newHashMap();
-		if (Common.isNotNull(allUserVoR)
-				&& Common.isNotNull(allUserVoR.getData())
-				&& Common.isNotNull(allUserVoR.getData().getUserNames())){
-			allUserDTOMap = allUserVoR.getData().getUserNames();
-		}
         for (THaveSalaryNosocial haveSalaryNosocial : haveSalaryNosocialList) {
             // 有工资无社保    薪酬人员查询 表单类型为薪资的  连续3个月有发薪记录  但是这三个月都没有社保缴费记录
             if (empPaymentInfoMap.get(haveSalaryNosocial.getEmployeeIdCard()) != null) {
@@ -168,10 +160,6 @@ public class THaveSalaryNosocialServiceImpl extends ServiceImpl<THaveSalaryNosoc
             TSettleDomainSelectVo selectVo = settleDomainSelectVoMap.get(haveSalaryNosocial.getSettleDomainId());
             haveSalaryNosocial.setCustomerId(selectVo!=null?selectVo.getCustomerId():null);
             haveSalaryNosocial.setCustomerName(selectVo!=null?selectVo.getCustomerName():null);
-            //塞创建人数据
-            if(haveSalaryNosocial.getCreateBy()!=null) {
-                haveSalaryNosocial.setCreateBy(allUserDTOMap.get(haveSalaryNosocial.getCreateBy()));
-            }
             haveSalaryNosocial.setCreateTime(LocalDateTime.now());
 			haveSalaryNosocial.setCreateMonth(salaryMonth);
             this.save(haveSalaryNosocial);

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

@@ -119,6 +119,9 @@ public class TSpecialDeducationSumServiceImpl extends ServiceImpl<TSpecialDeduca
 					   .replace("/","")
 					   .replace("-",""));
                if (Common.isNotNull(yearMonth)) {
+				    if (!Common.isNumber(yearMonth) || yearMonth.length() != CommonConstants.SIX_INT){
+						return R.failed("日期格式有误:" + yearMonth + "，不允许导入");
+					}
                     if (!yearMonth.equals(nowYearMonth)) {
                          return R.failed("所得期间-不是当前年月:" + nowYearMonth + "，不允许导入");
                     }

yifu-salary/yifu-salary-biz/src/main/resources/mapper/THaveSalaryNosocialMapper.xml

@@ -95,6 +95,7 @@
 		a.month,
 		a.relay_salary,
 		a.CREATE_NAME,
+               a.CREATE_BY,
                a.feed_back,a.reason_type
         FROM t_have_salary_nosocial a
         <include refid="querPage"/>

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

@@ -532,12 +532,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				// 插入社保信息并封装社保公积金查询信息
 				if (Common.isNotNull(socialsMap)){
 					social = socialsMap.get(excel.getEmpIdcard());
-					insertSocial(emp, social);
+					insertSocial(emp, social,project);
 				}
 				//  插入公积金信息并封装社保公积金查询信息
 				if (Common.isNotNull(fundsMap)){
 					fund = fundsMap.get(excel.getEmpIdcard());
-					insertFund(emp, fund);
+					insertFund(emp, fund,project);
 				}
 				//  插入派单信息
 				if (Common.isNotNull(dispatchMap)){
@@ -615,22 +615,26 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		}
 	}
 
-	private void insertSocial(EmpAddDispatchVo emp, TSocialInfo social) {
+	private void insertSocial(EmpAddDispatchVo emp, TSocialInfo social, EmpProjectDispatchVo project) {
 		if (Common.isNotNull(social) && Common.isEmpty(social.getId())){
 			if (Common.isNotNull(emp)){
-				social.setEmpNo(emp.getEmpCode());
 				social.setEmpId(emp.getId());
 			}
+			if (Common.isNotNull(project)){
+				social.setEmpNo(project.getEmpNo());
+			}
 			socialMapper.insert(social);
 		}
 	}
 
-	private void insertFund(EmpAddDispatchVo emp, TProvidentFund fund) {
+	private void insertFund(EmpAddDispatchVo emp, TProvidentFund fund, EmpProjectDispatchVo project) {
 		if (Common.isNotNull(fund)  && Common.isEmpty(fund.getId())){
 			if (Common.isNotNull(emp)){
-				fund.setEmpNo(emp.getEmpCode());
 				fund.setEmpId(emp.getId());
 			}
+			if (Common.isNotNull(project)){
+				fund.setEmpNo(project.getEmpNo());
+			}
 			fundMapper.insert(fund);
 		}
 	}