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

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

@@ -203,9 +203,9 @@
 		if(sum(if((PROJECT_STATUS = 0 and IS_COMPLETE = '0') or PROJECT_STATUS = 1,0,1)) > 0,1,0) as IS_COMPLETE,
 		sum(if((PROJECT_STATUS = 0 and IS_COMPLETE = '0') or PROJECT_STATUS = 1,0,1)) as INCOMPLETE_NUM,
 		concat(ROUND((sum(if(PROJECT_STATUS = 0,1,0)) - sum(if((PROJECT_STATUS = 0 and IS_COMPLETE = '0') or PROJECT_STATUS = 1,0,1)))*100/sum(if(PROJECT_STATUS = 0,1,0)),2),'%') as COMPLETE_PER,
-		sum(if(PROJECT_STATUS = 0 and DATE_FORMAT(CREATE_TIME,'%Y-%m-%d') >= '2024-07-01',1,0)) as AFTER_EMPLOYMENT,
-		if(sum(if((PROJECT_STATUS = 0 and DATE_FORMAT(CREATE_TIME,'%Y-%m-%d') >= '2024-07-01' and IS_COMPLETE = '0') or '2024-07-01' > DATE_FORMAT(CREATE_TIME,'%Y-%m-%d') or PROJECT_STATUS = 1,0,1)) > 0,1,0) AFTER_IS_COMPLETE,
-		sum(if(PROJECT_STATUS = 0 and DATE_FORMAT(CREATE_TIME,'%Y-%m-%d') >= '2024-07-01' and IS_COMPLETE = '1',1,0)) as AFTER_INCOMPLETE_NUM
+		sum(if(PROJECT_STATUS = 0 and DATE_FORMAT(CREATE_TIME,'%Y-%m-%d') >= '2024-10-01',1,0)) as AFTER_EMPLOYMENT,
+		if(sum(if((PROJECT_STATUS = 0 and DATE_FORMAT(CREATE_TIME,'%Y-%m-%d') >= '2024-10-01' and IS_COMPLETE = '0') or '2024-10-01' > DATE_FORMAT(CREATE_TIME,'%Y-%m-%d') or PROJECT_STATUS = 1,0,1)) > 0,1,0) AFTER_IS_COMPLETE,
+		sum(if(PROJECT_STATUS = 0 and DATE_FORMAT(CREATE_TIME,'%Y-%m-%d') >= '2024-10-01' and IS_COMPLETE = '1',1,0)) as AFTER_INCOMPLETE_NUM
 		from t_employee_project where DELETE_FLAG = '0' and PROJECT_STATUS = 0 group by DEPT_NO) a on a.DEPT_NO = b.DEPART_NO
 		where b.DELETE_FLAG = '0'
 		<if test="deptNo != null and deptNo.trim() != ''">

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

@@ -322,7 +322,6 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 			TCheckBankNo checkBankNo;
 			for (TSalaryEmployee employee : saveNewEmpList) {
 				// cyx-mvp1.7.0：调整 代发户的新员工也校验银行卡号
-				log.error("走到了》》》》saveNewEmployeeList");
 				if (Common.isNotNull(employee.getBankNo())
 						//&& (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT))
 						&& (Common.isEmpty(employee.getSalaryGiveTime())
@@ -346,7 +345,6 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 						, "/tcheckbankno/inner/checkBankNoBatch", bankList, CheckBatchVo.class, SecurityConstants.FROM_IN);
 				if (checkListR != null && checkListR.getData() != null) {
 					bankMap = checkListR.getData().getCheckMap();
-					log.error("走到了》》》》bankMap>>{}",bankMap.toString());
 				}
 			}
 			if (!phoneList.isEmpty()) {
@@ -359,7 +357,6 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 
 			boolean isFalse = false;
 			for (TSalaryEmployee employee : saveNewEmpList) {
-				log.error("走到了》》》》代发户的新员工也校验银行卡号");
 				// cyx-mvp1.7.0：调整 代发户的新员工也校验银行卡号
 				if (Common.isNotNull(employee.getBankNo())
 						//&& (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT))
@@ -367,7 +364,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 							|| CommonConstants.ZERO_STRING.equals(employee.getSalaryGiveTime())
 							|| (CommonConstants.ONE_STRING.equals(employee.getSalaryGiveTime()) && Common.isNotNull(employee.getBankNo())))) {
 					if (bankMap.get(employee.getBankNo()) != null) {
-						log.error("走到了》》》》校验银行卡号>>{}",bankMap.get(employee.getBankNo()));
+						// log.info("走到了》》》》saveNewEmpList---校验银行卡号>>{}",bankMap.get(employee.getBankNo()));
 						if (Boolean.FALSE.equals(bankMap.get(employee.getBankNo()))) {
 							errorList.add(new ErrorMessage((employee.getLineNums()  ), "第" + (employee.getLineNums()  ) + "行：该员工新建失败：【姓名与卡号验证：认证不一致】"));
 							isFalse = true;
@@ -404,7 +401,6 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 			TCheckBankNo checkBankNo;
 			for (TSalaryEmployee employee : updateEmployeeBankList) {
 				// cyx-mvp1.7.0：调整 代发户的新员工也校验银行卡号
-				log.error("走到了》》》》updateEmployeeBankList");
 				if (Common.isNotNull(employee.getBankNo())
 						//&& (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT))
 				) {
@@ -431,7 +427,6 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 			TSalaryEmpModLog empLog;
 			List<TSalaryEmpModLog> saveLogList = new ArrayList<>();
 			for (TSalaryEmployee employee : updateEmployeeBankList) {
-				log.error("走到了》》》》updateEmployeeBankList2");
 				if (Common.isNotNull(employee.getBankNo())) {
 					// cyx-mvp1.7.0：调整 代发户的新员工也校验银行卡号
 						//if (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT)) {
@@ -456,8 +451,8 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 										isFalse = true;
 									}
 								}
-								log.error("走到了》》》》updateEmployeeBank校验银行卡号>>{}",bankMap.get(employee.getBankNo()));
-								log.error("走到了》》》》updateEmployeeBank校验银行卡号>>employee>>{}",employee.toString());
+								// log.info("走到了》》》》updateEmployeeBank校验银行卡号>>{}",bankMap.get(employee.getBankNo()));
+								// log.info("走到了》》》》updateEmployeeBank校验银行卡号>>employee>>{}",employee.toString());
 								// 有变更才更新
 								if ((Common.isNotNull(employee.getBankNo()) && !employee.getBankNo().equals(oldEmp.getBankNo()))
 										|| (Common.isNotNull(employee.getBankProvince()) && !employee.getBankProvince().equals(oldEmp.getBankProvince()))

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java

@@ -630,15 +630,12 @@ public class SalaryAccountUtil implements Serializable {
 						}
 					}
 					if (canSave) {
-						log.error("走到了》》》》canSave");
 						// 新增
 						if (!saveNewEmpList.isEmpty()) {
-							log.error("走到了》》》》saveNewEmpList");
 							tSalaryEmployeeService.saveNewEmployeeList(saveNewEmpList, errorList);
 						}
 						// 更新人员信息
 						if (!updateEmpBankList.isEmpty()) {
-							log.error("走到了》》》》updateEmpBankList");
 							tSalaryEmployeeService.updateEmployeeBankList(updateEmpBankList, updateEmpBankMap, errorList);
 						}
 					}