zhouli il y a 9 mois
Parent
commit
1c275be00a

+ 5 - 5
kd-service/kd-scientific/src/main/java/org/sky/scientific/excel/TechnicianExcel.java

@@ -49,13 +49,13 @@ public class TechnicianExcel implements Serializable {
 	@ColumnWidth(20)
 	@ColumnWidth(20)
 	@ExcelProperty("民族")
 	@ExcelProperty("民族")
 	private String ethnic;
 	private String ethnic;
+//
+//	@ColumnWidth(20)
+//	@ExcelProperty("所属二级单位")
+//	private String secondaryUnit;
 
 
 	@ColumnWidth(20)
 	@ColumnWidth(20)
-	@ExcelProperty("所属二级单位")
-	private String secondaryUnit;
-
-	@ColumnWidth(20)
-	@ExcelProperty("部门/科室/项目部")
+	@ExcelProperty("所属二级单位/部门")
 	private String department;
 	private String department;
 
 
 	@ColumnWidth(20)
 	@ColumnWidth(20)

+ 1 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/SalaryMapper.xml

@@ -69,7 +69,7 @@
             <if test="medicalInsurance!=null">medical_insurance = #{medicalInsurance}, medical_insurance_edit = 1,</if>
             <if test="medicalInsurance!=null">medical_insurance = #{medicalInsurance}, medical_insurance_edit = 1,</if>
             <if test="unemploymentInsurance!=null">unemployment_insurance = #{unemploymentInsurance},unemployment_insurance_edit = 1,</if>
             <if test="unemploymentInsurance!=null">unemployment_insurance = #{unemploymentInsurance},unemployment_insurance_edit = 1,</if>
             <if test="injuryInsurance!=null">injury_insurance = #{injuryInsurance}, injury_insurance_edit = 1,</if>
             <if test="injuryInsurance!=null">injury_insurance = #{injuryInsurance}, injury_insurance_edit = 1,</if>
-            <if test="maternityInsurance!=null">maternity_insurance = #{maternityInsurance}, maternity_insurance = 1,</if>
+            <if test="maternityInsurance!=null">maternity_insurance = #{maternityInsurance}, maternity_insurance_edit = 1,</if>
             <if test="providentFund!=null">provident_fund = #{providentFund}, provident_fund_edit = 1,</if>
             <if test="providentFund!=null">provident_fund = #{providentFund}, provident_fund_edit = 1,</if>
             <if test="bonus!=null">bonus = #{bonus}, bonus_edit = 1,</if>
             <if test="bonus!=null">bonus = #{bonus}, bonus_edit = 1,</if>
             <if test="benefit!=null">benefit = #{benefit}, benefit_edit = 1,</if>
             <if test="benefit!=null">benefit = #{benefit}, benefit_edit = 1,</if>

+ 11 - 22
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/TechnicianServiceImpl.java

@@ -71,11 +71,7 @@ public class TechnicianServiceImpl extends BaseServiceImpl<TechnicianMapper, Tec
 			unicode = UUID.randomUUID().toString();
 			unicode = UUID.randomUUID().toString();
 		}
 		}
 		technician.setUnicode(unicode);
 		technician.setUnicode(unicode);
-		//根据年月和工号或身份证
-//		LambdaQueryWrapper<TechnicianEntity> wrapper = Wrappers.<TechnicianEntity>lambdaQuery()
-//			.eq(TechnicianEntity::getYearAndMonth, technician.getYearAndMonth())
-//			.eq(TechnicianEntity::getNumber, technician.getNumber())
-//			.eq(TechnicianEntity::getIdCard, technician.getIdCard());
+
 		LambdaQueryWrapper<TechnicianEntity> wrapper = Wrappers.<TechnicianEntity>lambdaQuery()
 		LambdaQueryWrapper<TechnicianEntity> wrapper = Wrappers.<TechnicianEntity>lambdaQuery()
 			.eq(TechnicianEntity::getYearAndMonth, technician.getYearAndMonth())
 			.eq(TechnicianEntity::getYearAndMonth, technician.getYearAndMonth())
 			.eq(TechnicianEntity::getUnicode, technician.getUnicode());
 			.eq(TechnicianEntity::getUnicode, technician.getUnicode());
@@ -84,10 +80,7 @@ public class TechnicianServiceImpl extends BaseServiceImpl<TechnicianMapper, Tec
 			//新增
 			//新增
 			return this.save(technician);
 			return this.save(technician);
 		}
 		}
-//		else {
-//			technician.setId(dbTechnician.getId());
-//			return this.updateById(technician);
-//		}
+
 		return true;
 		return true;
 	}
 	}
 
 
@@ -149,25 +142,21 @@ public class TechnicianServiceImpl extends BaseServiceImpl<TechnicianMapper, Tec
 			technician.setYearAndMonth(yearAndMonth);
 			technician.setYearAndMonth(yearAndMonth);
 
 
  			if(Func.isNotBlank(excel.getDepartment())){
  			if(Func.isNotBlank(excel.getDepartment())){
-				LambdaQueryWrapper<DepartmentEntity> eq = Wrappers.<DepartmentEntity>lambdaQuery()
-					.eq(DepartmentEntity::getName, excel.getDepartment())
-					.eq(DepartmentEntity::getYearAndMonth, StringUtil.sub(yearAndMonth, 0, 4));
-				DepartmentEntity dbDepartment = departmentMapper.selectOne(eq);
-				if(Func.isNull(dbDepartment)){
-					throw new ServiceException("序号为["+excel.getXh()+"]的部门/科室/项目部["+excel.getDepartment()+"]不存在");
+				List<String> tmpList = Arrays.asList(excel.getDepartment().split("/"));
+				String department = null;
+				if(tmpList.size() == 1 || tmpList.size() == 2){
+					department = tmpList.get(tmpList.size() - 1);
+				}else {
+					throw new ServiceException("所属二级单位/部门最多只能有两级,用'/'分隔");
 				}
 				}
-				technician.setDepartment(departmentMapper.getFullNameById(dbDepartment.getId()));
-				technician.setDepartmentId(dbDepartment.getId());
-			}else if(Func.isNotBlank(excel.getSecondaryUnit())){
 				LambdaQueryWrapper<DepartmentEntity> eq = Wrappers.<DepartmentEntity>lambdaQuery()
 				LambdaQueryWrapper<DepartmentEntity> eq = Wrappers.<DepartmentEntity>lambdaQuery()
-					.eq(DepartmentEntity::getName, excel.getSecondaryUnit())
+					.eq(DepartmentEntity::getName, department)
 					.eq(DepartmentEntity::getYearAndMonth, StringUtil.sub(yearAndMonth, 0, 4));
 					.eq(DepartmentEntity::getYearAndMonth, StringUtil.sub(yearAndMonth, 0, 4));
 				DepartmentEntity dbDepartment = departmentMapper.selectOne(eq);
 				DepartmentEntity dbDepartment = departmentMapper.selectOne(eq);
 				if(Func.isNull(dbDepartment)){
 				if(Func.isNull(dbDepartment)){
-					throw new ServiceException("序号为["+excel.getXh()+"]的所属二级单位["+excel.getDepartment()+"]不存在");
+					throw new ServiceException("序号为["+excel.getXh()+"]的部门/科室/项目部["+excel.getDepartment()+"]不存在");
 				}
 				}
-				technician.setDepartment(departmentMapper.getFullNameById(dbDepartment.getId()));
-				technician.setDepartmentId(dbDepartment.getId());
+ 				technician.setDepartmentId(dbDepartment.getId());
 			}
 			}
 			this.saveOrUpdateTechnician(technician);
 			this.saveOrUpdateTechnician(technician);
 		}
 		}

BIN
kd-service/kd-scientific/src/main/resources/export-template/技术人员花名册.xls