绩效结果考核申报问题修改；代码优化

ims-service/ims-eval/src/main/java/com/ims/eval/controller/DeptAssessmentDeclarationController.java

@@ -79,8 +79,8 @@ public class DeptAssessmentDeclarationController {
 		@RequestParam(value = "deptId") String deptId,
 		@RequestParam(value = "orderNumber", required = false) String orderNumber,
 		@RequestParam(value = "deptName", required = false) String deptName,
-		@RequestParam(value = "annual", required = false) String annual,
-		@RequestParam(value = "declarationMonth", required = false) String declarationMonth) {
+		@RequestParam(value = "annual", required = false) Integer annual,
+		@RequestParam(value = "declarationMonth", required = false) Integer declarationMonth) {
 		IPage<DeptAssessmentDeclaration> list = deptAssessmentDeclarationService.listPage(pageNum, pageSize, deptId, orderNumber, deptName, annual, declarationMonth);
 		return R.ok().data(list);
 	}
@@ -109,10 +109,10 @@ public class DeptAssessmentDeclarationController {
 			if (StringUtils.isNotEmpty(deptAssessmentDeclaration.getDeptId())) {
 				qw.lambda().eq(DeptAssessmentDeclaration::getDeptId, deptAssessmentDeclaration.getDeptId());
 			}
-			if (StringUtils.isNotEmpty(deptAssessmentDeclaration.getAnnual())) {
+			if (null != deptAssessmentDeclaration.getAnnual()) {
 				qw.lambda().eq(DeptAssessmentDeclaration::getAnnual, deptAssessmentDeclaration.getAnnual());
 			}
-			if (StringUtils.isNotEmpty(deptAssessmentDeclaration.getDeclarationMonth())) {
+			if (null != deptAssessmentDeclaration.getDeclarationMonth()) {
 				qw.lambda().eq(DeptAssessmentDeclaration::getDeclarationMonth, deptAssessmentDeclaration.getDeclarationMonth());
 			}
 			DeptAssessmentDeclaration assessmentDeclaration = deptAssessmentDeclarationService.getOne(qw);
@@ -377,7 +377,7 @@ public class DeptAssessmentDeclarationController {
 		}
 		DeptAssessmentDeclaration deptAssessmentDeclaration = deptAssessmentDeclarationService.getById(id);
 		String departmentName = deptAssessmentDeclaration.getDeptName();
-		String month = deptAssessmentDeclaration.getDeclarationMonth();
+		String month = String.valueOf(deptAssessmentDeclaration.getDeclarationMonth());
 		String level = deptAssessmentDeclaration.getRatingGrade();
 		String leader = deptAssessmentDeclaration.getDeptLeaderName();
 		String declarationReason = deptAssessmentDeclaration.getDeclarationReason();
@@ -391,18 +391,22 @@ public class DeptAssessmentDeclarationController {
 	 * @param month  月份
 	 */
 	@GetMapping(value = "/statisticalSummary/{annual}/{month}")
-	public R statisticalSummary(@PathVariable("annual") String annual, @PathVariable("month") String month) {
+	public R statisticalSummary(@PathVariable("annual") Integer annual, @PathVariable("month") Integer month) {
 		List<SummaryInformationDTO> summaryInformationDTOList = new ArrayList<>();
 		QueryWrapper<DeptAssessmentDeclaration> qw = new QueryWrapper<>();
-		if (StringUtils.isNotEmpty(annual)) {
-			qw.lambda().like(DeptAssessmentDeclaration::getAnnual, annual);
+		if (null != annual) {
+			qw.lambda().eq(DeptAssessmentDeclaration::getAnnual, annual);
 		}
-		if (StringUtils.isNotEmpty(month)) {
-			qw.lambda().like(DeptAssessmentDeclaration::getDeclarationMonth, month);
+		if (null != month) {
+			qw.lambda().eq(DeptAssessmentDeclaration::getDeclarationMonth, month);
 		}
 		List<DeptAssessmentDeclaration> deptAssessmentDeclarationList = deptAssessmentDeclarationService.list(qw);
 		for (DeptAssessmentDeclaration deptAssessmentDeclaration : deptAssessmentDeclarationList) {
-			EvaluationDept evaluationDept = evaluationDeptService.getById(deptAssessmentDeclaration.getDeptId());
+			QueryWrapper<EvaluationDept> qwDept = new QueryWrapper<>();
+			if (StringUtils.isNotEmpty(deptAssessmentDeclaration.getDeptId())) {
+				qwDept.lambda().eq(EvaluationDept::getDeptId, deptAssessmentDeclaration.getDeptId());
+			}
+			EvaluationDept evaluationDept = evaluationDeptService.getOne(qwDept);
 			List<DeptAssessmentDeclarationContent> deptAssessmentDeclarationContentList = deptAssessmentDeclarationContentService.detailsList(deptAssessmentDeclaration.getId());
 			for (DeptAssessmentDeclarationContent deptAssessmentDeclarationContent : deptAssessmentDeclarationContentList) {
 				SummaryInformationDTO summaryInformationDTO = new SummaryInformationDTO();
@@ -425,7 +429,7 @@ public class DeptAssessmentDeclarationController {
 			}
 			list.addAll(value);
 		});
-		list.stream().sorted(Comparator.comparing(SummaryInformationDTO::getSerialNumber, Comparator.nullsLast(Integer::compareTo))).collect(Collectors.toList());
+		list.sort(Comparator.comparing(SummaryInformationDTO::getSerialNumber, Comparator.nullsLast(Integer::compareTo)));
 		return R.ok().data(list);
 	}
 
@@ -473,7 +477,7 @@ public class DeptAssessmentDeclarationController {
 			}
 			list.addAll(value);
 		});
-		list.stream().sorted(Comparator.comparing(SummaryInformationDTO::getSerialNumber, Comparator.nullsLast(Integer::compareTo))).collect(Collectors.toList());
+		list.sort(Comparator.comparing(SummaryInformationDTO::getSerialNumber, Comparator.nullsLast(Integer::compareTo)));
 		ExcelUtils.createCollectExcel(list, annual, month, response.getOutputStream());
 	}
 

ims-service/ims-eval/src/main/java/com/ims/eval/dao/DeptAssessmentDeclarationMapper.java

@@ -13,6 +13,6 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface DeptAssessmentDeclarationMapper extends BaseMapper<DeptAssessmentDeclaration> {
 
-	IPage<DeptAssessmentDeclaration> selectListPage(Page<DeptAssessmentDeclaration> page, @Param("deptId") String deptId, @Param("orderNumber") String orderNumber, @Param("deptName") String deptName, @Param("annual") String annual, @Param("declarationMonth") String declarationMonth);
+	IPage<DeptAssessmentDeclaration> selectListPage(Page<DeptAssessmentDeclaration> page, @Param("deptId") String deptId, @Param("orderNumber") String orderNumber, @Param("deptName") String deptName, @Param("annual") Integer annual, @Param("declarationMonth") Integer declarationMonth);
 
 }

ims-service/ims-eval/src/main/java/com/ims/eval/entity/DeptAssessmentDeclaration.java

@@ -29,9 +29,9 @@ public class DeptAssessmentDeclaration extends Model {
 	//部门名称
 	private String deptName;
 	//年度
-	private String annual;
+	private Integer annual;
 	//申报月份
-	private String declarationMonth;
+	private Integer declarationMonth;
 	//申报等级
 	private String declarationLevel;
 	//评定等级

ims-service/ims-eval/src/main/java/com/ims/eval/entity/dto/request/SummaryInformationDTO.java

@@ -22,7 +22,7 @@ public class SummaryInformationDTO {
 	private String reportingDepartment;
 	//申报级别
 	private String declarationLevel;
-
+	//排序
 	private Integer serialNumber;
 
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/IDeptAssessmentDeclarationService.java

@@ -14,7 +14,7 @@ import java.util.List;
  */
 public interface IDeptAssessmentDeclarationService extends IService<DeptAssessmentDeclaration> {
 
-	IPage<DeptAssessmentDeclaration> listPage(Integer pageNum, Integer pageSize, String deptId, String orderNumber, String deptName, String annual, String declarationMonth);
+	IPage<DeptAssessmentDeclaration> listPage(Integer pageNum, Integer pageSize, String deptId, String orderNumber, String deptName, Integer annual, Integer declarationMonth);
 
 	boolean save(DeptAssessmentDeclaration deptAssessmentDeclaration, HttpServletRequest request);
 

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/DeptAssessmentDeclarationServiceImpl.java

@@ -46,7 +46,7 @@ public class DeptAssessmentDeclarationServiceImpl extends ServiceImpl<DeptAssess
 	private IEvaluationDeptRatingService evaluationDeptRatingService;
 
 	@Override
-	public IPage<DeptAssessmentDeclaration> listPage(Integer pageNum, Integer pageSize, String deptId, String orderNumber, String deptName, String annual, String declarationMonth) {
+	public IPage<DeptAssessmentDeclaration> listPage(Integer pageNum, Integer pageSize, String deptId, String orderNumber, String deptName, Integer annual, Integer declarationMonth) {
 		if ("23031009".equals(deptId)) {//组织人事部
 			deptId = "";
 		}
@@ -61,16 +61,16 @@ public class DeptAssessmentDeclarationServiceImpl extends ServiceImpl<DeptAssess
 	@Override
 	public boolean save(DeptAssessmentDeclaration deptAssessmentDeclaration, HttpServletRequest request) {
 		QueryWrapper<DeptAssessmentDeclaration> qw = new QueryWrapper<>();
-		if (StringUtils.isNotEmpty(deptAssessmentDeclaration.getAnnual())) {
+		if (null != deptAssessmentDeclaration.getAnnual()) {
 			qw.lambda().like(DeptAssessmentDeclaration::getAnnual, deptAssessmentDeclaration.getAnnual());
 		}
-		if (StringUtils.isNotEmpty(deptAssessmentDeclaration.getDeclarationMonth())) {
+		if (null != deptAssessmentDeclaration.getDeclarationMonth()) {
 			qw.lambda().eq(DeptAssessmentDeclaration::getDeclarationMonth, deptAssessmentDeclaration.getDeclarationMonth());
 		}
 		int count = super.count(qw);
 		String id = Convert.toStr(IdUtil.getSnowflake(1, 1).nextId());
 		deptAssessmentDeclaration.setId(id);
-		deptAssessmentDeclaration.setOrderNumber("KHSB_GDDL_" + deptAssessmentDeclaration.getAnnual() + "_" + StringUtils.addZeroForStr(String.valueOf(Integer.parseInt(deptAssessmentDeclaration.getDeclarationMonth())), 2, "l") + StringUtils.addZeroForStr(String.valueOf(count + 1), 2, "l"));
+		deptAssessmentDeclaration.setOrderNumber("KHSB_GDDL_" + deptAssessmentDeclaration.getAnnual() + "_" + StringUtils.addZeroForStr(String.valueOf(deptAssessmentDeclaration.getDeclarationMonth()), 2, "l") + StringUtils.addZeroForStr(String.valueOf(count + 1), 2, "l"));
 		deptAssessmentDeclaration.setRatingGrade(deptAssessmentDeclaration.getDeclarationLevel());
 		deptAssessmentDeclaration.setStage("流程未启动");
 		deptAssessmentDeclaration.setCreateTime(DateUtil.date());
@@ -169,7 +169,7 @@ public class DeptAssessmentDeclarationServiceImpl extends ServiceImpl<DeptAssess
 			if (StringUtils.isNotEmpty(deptAssessmentDeclaration.getDeptId())) {
 				qw.lambda().eq(EvaluationDeptRating::getDeptId, deptAssessmentDeclaration.getDeptId());
 			}
-			if (StringUtils.isNotEmpty(deptAssessmentDeclaration.getAnnual())) {
+			if (null != deptAssessmentDeclaration.getAnnual()) {
 				qw.lambda().eq(EvaluationDeptRating::getAnnual, deptAssessmentDeclaration.getAnnual());
 			}
 			EvaluationDeptRating evaluationDeptRating = evaluationDeptRatingService.getOne(qw);
@@ -186,51 +186,51 @@ public class DeptAssessmentDeclarationServiceImpl extends ServiceImpl<DeptAssess
 	}
 
 	private static void insertContent(DeptAssessmentDeclaration deptAssessmentDeclaration, EvaluationDeptRating evaluationDeptRating) {
-		if ("1".equals(deptAssessmentDeclaration.getDeclarationMonth())) {
+		if (1 == deptAssessmentDeclaration.getDeclarationMonth()) {
 			evaluationDeptRating.setJan(deptAssessmentDeclaration.getRatingGrade());
 			evaluationDeptRating.setJanContent(deptAssessmentDeclaration.getDeclarationReason());
 		}
-		if ("2".equals(deptAssessmentDeclaration.getDeclarationMonth())) {
+		if (2 == deptAssessmentDeclaration.getDeclarationMonth()) {
 			evaluationDeptRating.setFeb(deptAssessmentDeclaration.getRatingGrade());
 			evaluationDeptRating.setFebContent(deptAssessmentDeclaration.getDeclarationReason());
 		}
-		if ("3".equals(deptAssessmentDeclaration.getDeclarationMonth())) {
+		if (3 == deptAssessmentDeclaration.getDeclarationMonth()) {
 			evaluationDeptRating.setMar(deptAssessmentDeclaration.getRatingGrade());
 			evaluationDeptRating.setMarContent(deptAssessmentDeclaration.getDeclarationReason());
 		}
-		if ("4".equals(deptAssessmentDeclaration.getDeclarationMonth())) {
+		if (4 == deptAssessmentDeclaration.getDeclarationMonth()) {
 			evaluationDeptRating.setApr(deptAssessmentDeclaration.getRatingGrade());
 			evaluationDeptRating.setAprContent(deptAssessmentDeclaration.getDeclarationReason());
 		}
-		if ("5".equals(deptAssessmentDeclaration.getDeclarationMonth())) {
+		if (5 == deptAssessmentDeclaration.getDeclarationMonth()) {
 			evaluationDeptRating.setMay(deptAssessmentDeclaration.getRatingGrade());
 			evaluationDeptRating.setMayContent(deptAssessmentDeclaration.getDeclarationReason());
 		}
-		if ("6".equals(deptAssessmentDeclaration.getDeclarationMonth())) {
+		if (6 == deptAssessmentDeclaration.getDeclarationMonth()) {
 			evaluationDeptRating.setJun(deptAssessmentDeclaration.getRatingGrade());
 			evaluationDeptRating.setJunContent(deptAssessmentDeclaration.getDeclarationReason());
 		}
-		if ("7".equals(deptAssessmentDeclaration.getDeclarationMonth())) {
+		if (7 == deptAssessmentDeclaration.getDeclarationMonth()) {
 			evaluationDeptRating.setJul(deptAssessmentDeclaration.getRatingGrade());
 			evaluationDeptRating.setJulContent(deptAssessmentDeclaration.getDeclarationReason());
 		}
-		if ("8".equals(deptAssessmentDeclaration.getDeclarationMonth())) {
+		if (8 == deptAssessmentDeclaration.getDeclarationMonth()) {
 			evaluationDeptRating.setAug(deptAssessmentDeclaration.getRatingGrade());
 			evaluationDeptRating.setAugContent(deptAssessmentDeclaration.getDeclarationReason());
 		}
-		if ("9".equals(deptAssessmentDeclaration.getDeclarationMonth())) {
+		if (9 == deptAssessmentDeclaration.getDeclarationMonth()) {
 			evaluationDeptRating.setSep(deptAssessmentDeclaration.getRatingGrade());
 			evaluationDeptRating.setSepContent(deptAssessmentDeclaration.getDeclarationReason());
 		}
-		if ("10".equals(deptAssessmentDeclaration.getDeclarationMonth())) {
+		if (10 == deptAssessmentDeclaration.getDeclarationMonth()) {
 			evaluationDeptRating.setOct(deptAssessmentDeclaration.getRatingGrade());
 			evaluationDeptRating.setOctContent(deptAssessmentDeclaration.getDeclarationReason());
 		}
-		if ("11".equals(deptAssessmentDeclaration.getDeclarationMonth())) {
+		if (11 == deptAssessmentDeclaration.getDeclarationMonth()) {
 			evaluationDeptRating.setNov(deptAssessmentDeclaration.getRatingGrade());
 			evaluationDeptRating.setNovContent(deptAssessmentDeclaration.getDeclarationReason());
 		}
-		if ("12".equals(deptAssessmentDeclaration.getDeclarationMonth())) {
+		if (12 == deptAssessmentDeclaration.getDeclarationMonth()) {
 			evaluationDeptRating.setDece(deptAssessmentDeclaration.getRatingGrade());
 			evaluationDeptRating.setDeceContent(deptAssessmentDeclaration.getDeclarationReason());
 		}

ims-service/ims-eval/src/main/resources/mappers/DeptAssessmentDeclarationMapper.xml

@@ -75,7 +75,7 @@
                 AND dad.declaration_month = #{declarationMonth}
             </if>
         </where>
-        order by ed.serial_number asc, dad.declaration_month desc
+        order by ed.serial_number asc, dad.annual desc, dad.declaration_month desc
     </select>
 
 </mapper>