提交

src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java

@@ -1519,11 +1519,14 @@ public class SalaryManagementController {
 				YgglMainEmp emp = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getName, file.getEmpname()).eq(YgglMainEmp::getPhone, file.getPhone())
 				YgglMainEmp emp = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getName, file.getEmpname()).eq(YgglMainEmp::getPhone, file.getPhone())
 						.eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()));
 						.eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()));
 				if(emp != null) {
 				if(emp != null) {
+					
+					if(file.getSxrq().length() == 10) {
+						
 						//0:定薪  1：调薪
 						//0:定薪  1：调薪
 						if(file.getSfdx() == 0) {
 						if(file.getSfdx() == 0) {
 							XcglAssoXzdadx xzdadx = XcglAssoXzdadx.builder().build();
 							XcglAssoXzdadx xzdadx = XcglAssoXzdadx.builder().build();
 							xzdadx.setUserid(emp.getEmpNum());//用户id
 							xzdadx.setUserid(emp.getEmpNum());//用户id
-						xzdadx.setSxrq(file.getSxrq());//生效日期
+							xzdadx.setSxrq(file.getSxrq().replace("/", "-"));//生效日期
 							xzdadx.setAddtime(new Date().getTime());
 							xzdadx.setAddtime(new Date().getTime());
 							xzdadx.setRemarks("");
 							xzdadx.setRemarks("");
 							xzdadx.setQyid(userBean.getOrgCode());
 							xzdadx.setQyid(userBean.getOrgCode());
@@ -1609,6 +1612,13 @@ public class SalaryManagementController {
 							}
 							}
 							toinsert++;
 							toinsert++;
 						}
 						}
+					
+					}else {
+						failure++;
+						map.put("name", name);
+						map.put("msg", "日期格式不对（Excel中输入时间处设置为“短日期”即可）");
+						reasons.add(map);
+					}
 				}else {
 				}else {
 					failure++;
 					failure++;
 					map.put("name", name);
 					map.put("name", name);