feat: something

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -524,239 +524,6 @@ public class WmScorePackageController {
             wmScorePackageService.listWmScorePackageAndTaskExt(page, wmScorePackage);
         }
 
-//		for (WmScorePackage ext : page.getRecords()) {
-//			List<WmScoreTaskType> taskTypelist = wmScoreTaskTypeMapper.getScoreTaskTypeByScoreId(ext.getId());
-//			if (taskTypelist != null && taskTypelist.size() > 0) {
-//				String taskTypes = taskTypelist.stream()
-//						.map(WmScoreTaskType::getTaskTypeName)
-//						.collect(Collectors.joining(","));
-//				ext.setTaskTypes(taskTypes);
-//			}
-//			if (!StringUtil.isEmpty(ext.getRelationScoreId())) {
-//				WmScorePackage wm1 = wmScorePackageService.getById(ext.getRelationScoreId());
-//				ext.setRelationScoreId(wm1.getScorePackageName());
-//			}
-//			WmScorePackage wmScorePackage2 = wmScorePackageService.getById(ext.getId());
-//			wmScorePackage2.setRelationScoreId(wmScorePackage2.getId());
-//			List<WmScorePackage> wmScorePackageList = wmScorePackageService.selectLists(wmScorePackage2);
-//			int score = 0;
-//			Integer total1 = 0;
-//			Integer ytjtt = 0;
-//			SysDept sysDept1 = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
-//			if (wmScorePackageList.size() > 0) {
-//				List<String> ids2 = wmScorePackageList.stream().map(WmScorePackage::getId).collect(Collectors.toList());
-//				for (String id : ids2) {
-//					WmScorePackage wmScorePackage1 = new WmScorePackage();
-//					wmScorePackage1.setRelationScoreId(id);
-//					List<WmScorePackage> wmScorePackageList1 = wmScorePackageService.selectLists(wmScorePackage1);
-//					WmTask wmTask1 = new WmTask();
-//					wmTask1.setScorePackageId(id);
-//					wmTask1.setTaskStatus(String.valueOf(3));
-//					List<WmTask> wmTaskList = wmTaskMapper.selectListByScorePackageId(wmTask1);
-//					if (sysDept1.getLevel() == 2) {
-//						List<WmTask> score1 = wmTaskList.stream()
-//								.filter(task -> task.getReportDrugApprovalStatus().equals("6"))
-//								.collect(Collectors.toList());
-//						for (WmTask item : score1) {
-//							if ("1".equals(item.getReportDrugApprovalOpinion())) {
-//								total1 += item.getScore();
-//
-//							}
-//							ytjtt += item.getScore();
-//						}
-//					}
-//					if (sysDept1.getLevel() == 3) {
-//						List<WmTask> score1 = wmTaskList.stream()
-//								.filter(task -> task.getReportOneApprovalStatus().equals("6"))
-//								.collect(Collectors.toList());
-//						for (WmTask item : score1) {
-//							if ("1".equals(item.getReportOneApprovalOpinion())) {
-//								total1 += item.getScore();
-//
-//							}
-//							ytjtt += item.getScore();
-//						}
-//					}
-//					if (sysDept1.getLevel() == 4) {
-//						List<WmTask> score1 = wmTaskList.stream()
-//								.filter(task -> task.getReportSecondApprovalStatus().equals("6"))
-//								.collect(Collectors.toList());
-//						for (WmTask item : score1) {
-//							if ("1".equals(item.getReportSecondApprovalOpinion())) {
-//								total1 += item.getScore();
-//
-//							}
-//							ytjtt += item.getScore();
-//						}
-//					}
-//					List<Integer> scoreList1 = wmTaskList.stream().map(WmTask::getScore).collect(Collectors.toList());
-//					Integer score2 = 0;
-//					for (Integer score1 : scoreList1) {
-//						score2 += score1;
-//					}
-//					score += score2;
-//					List<String> ids4 = wmScorePackageList1.stream().map(WmScorePackage::getId).collect(Collectors.toList());
-//					ids4.add(ext.getId());
-//					for (String id1 : ids4) {
-//						WmTask wmTask2 = new WmTask();
-//						wmTask2.setScorePackageId(id1);
-//						wmTask2.setTaskStatus(String.valueOf(3));
-//						List<WmTask> wmTaskList1 = wmTaskMapper.selectListByScorePackageId(wmTask2);
-//						if (sysDept1.getLevel() == 2) {
-//							List<WmTask> score1 = wmTaskList1.stream()
-//									.filter(task -> task.getReportDrugApprovalStatus().equals("6"))
-//									.collect(Collectors.toList());
-//							for (WmTask item : score1) {
-//								if ("1".equals(item.getReportDrugApprovalOpinion())) {
-//									total1 += item.getScore();
-//
-//								}
-//								ytjtt += item.getScore();
-//							}
-//
-//						}
-//						if (sysDept1.getLevel() == 3) {
-//							List<WmTask> score1 = wmTaskList1.stream()
-//									.filter(task -> task.getReportOneApprovalStatus().equals("6"))
-//									.collect(Collectors.toList());
-//							for (WmTask item : score1) {
-//								if ("1".equals(item.getReportOneApprovalOpinion())) {
-//									total1 += item.getScore();
-//
-//								}
-//								ytjtt += item.getScore();
-//							}
-//						}
-//						if (sysDept1.getLevel() == 4) {
-//							List<WmTask> score1 = wmTaskList1.stream()
-//									.filter(task -> task.getReportSecondApprovalStatus().equals("6"))
-//									.collect(Collectors.toList());
-//							for (WmTask item : score1) {
-//								if ("1".equals(item.getReportSecondApprovalOpinion())) {
-//									total1 += item.getScore();
-//
-//								}
-//								ytjtt += item.getScore();
-//							}
-//						}
-//						List<Integer> scoreList2 = wmTaskList1.stream()
-//								.map(WmTask::getScore)
-//								.collect(Collectors.toList());
-//						Integer score3 = 0;
-//						if (scoreList2.size() != 0) {
-//							for (Integer score1 : scoreList2) {
-//								score3 += score1;
-//							}
-//							score += score3;
-//						}
-//					}
-//				}
-//			} else {
-//				WmTask wmTask1 = new WmTask();
-//				wmTask1.setScorePackageId(ext.getId());
-//				wmTask1.setTaskStatus(String.valueOf(3));
-//				List<WmTask> wmTaskList1 = wmTaskMapper.selectListByScorePackageId(wmTask1);
-//				if (sysDept1.getLevel() == 2) {
-//					List<WmTask> score1 = wmTaskList1.stream()
-//							.filter(task -> task.getReportDrugApprovalStatus().equals("6"))
-//							.collect(Collectors.toList());
-//					for (WmTask item : score1) {
-//						if ("1".equals(item.getReportDrugApprovalOpinion())) {
-//							total1 += item.getScore();
-//
-//						}
-//						ytjtt += item.getScore();
-//					}
-//				}
-//				if (sysDept1.getLevel() == 3) {
-//					List<WmTask> score1 = wmTaskList1.stream()
-//							.filter(task -> task.getReportOneApprovalStatus().equals("6"))
-//							.collect(Collectors.toList());
-//					for (WmTask item : score1) {
-//						if ("1".equals(item.getReportOneApprovalOpinion())) {
-//							total1 += item.getScore();
-//
-//						}
-//						ytjtt += item.getScore();
-//					}
-//				}
-//				if (sysDept1.getLevel() == 4) {
-//					List<WmTask> score1 = wmTaskList1.stream()
-//							.filter(task -> task.getReportSecondApprovalStatus().equals("6"))
-//							.collect(Collectors.toList());
-//					for (WmTask item : score1) {
-//						if ("1".equals(item.getReportSecondApprovalOpinion())) {
-//							total1 += item.getScore();
-//
-//						}
-//						ytjtt += item.getScore();
-//					}
-//				}
-//				List<Integer> scoreList1 = wmTaskList1.stream().map(WmTask::getScore).collect(Collectors.toList());
-//				Integer score4 = 0;
-//				for (Integer score1 : scoreList1) {
-//					score4 += score1;
-//				}
-//				score = score4;
-//			}
-//
-//			// 完成积分值(最终完成积分值 = 完成积分值 * (1+审核管理费比例))
-//			int actualScore = BigDecimal.valueOf(score).multiply(
-//					ext.getAuditManagementFeeRates().divide(new BigDecimal("100.00"), RoundingMode.HALF_EVEN).add(BigDecimal.ONE)
-//			).intValue();
-//			ext.setYsh(actualScore);
-//
-//			// ytjtt(ytjtt = 完成积分值 * (1+审核管理费比例))
-//			int actualYtjtt = BigDecimal.valueOf(ytjtt).multiply(
-//					ext.getAuditManagementFeeRates().divide(new BigDecimal("100.00"), RoundingMode.HALF_EVEN).add(BigDecimal.ONE)
-//			).intValue();
-//			ext.setYtjtt(actualYtjtt);
-//
-//			// total1(total1 = 完成积分值 * (1+审核管理费比例))
-//			int actualTotal1 = BigDecimal.valueOf(total1).multiply(
-//					ext.getAuditManagementFeeRates().divide(new BigDecimal("100.00"), RoundingMode.HALF_EVEN).add(BigDecimal.ONE)
-//			).intValue();
-//			ext.setPayScore(actualTotal1);
-//
-//			BigDecimal fin = new BigDecimal(ext.getYsh()).multiply(BigDecimal.valueOf(100)).divide(new BigDecimal(ext.getScore()), 2, RoundingMode.HALF_UP);
-//			BigDecimal fin1 = BigDecimal.valueOf(100.00);
-//			if (fin.compareTo(fin1) == 1) {
-//				fin = BigDecimal.valueOf(100.00);
-//			}
-//			ext.setFinishRate(fin.toString());
-//			BigDecimal payRate = new BigDecimal(actualTotal1).multiply(BigDecimal.valueOf(100)).divide(new BigDecimal(ext.getScore()), 2, RoundingMode.HALF_UP);
-//			if (payRate.compareTo(fin1) > 0) {
-//				payRate = BigDecimal.valueOf(100.00);
-//			}
-//			ext.setPayRate(payRate.toString());
-//			if (ext.getPayRate().equals("100.00")) {
-//				ext.setPackageFinishStatus("1");
-//			}
-//
-//			// 封装导出结果
-//			ext.setReportMqName(CacheConstants.EXPORT_NBA_REPORT_CACHE);
-//			wmScorePackageService.getReportOpt(ext);
-//			// 封装excel报告状态
-//			wmScorePackageService.getExcelReportOpt(ext, CacheConstants.EXCEL_EXPORT_NBA_REPORT_CACHE);
-//		}
-//
-//		page.getRecords().forEach(r -> {
-//			if (r.getP2pAmount() != null) {
-//				r.setP2pDraft(false);
-//			} else {
-//				String s = redisTemplate.opsForValue().get(String.format("scorepackage:p2p:amount:%s", r.getId()));
-//				String s1 = redisTemplate.opsForValue().get(String.format("scorepackage:p2p:service-amount:%s", r.getId()));
-//				String desc = redisTemplate.opsForValue().get(String.format("scorepackage:p2p:desc:%s", r.getId()));
-//				if (CharSequenceUtil.isNotBlank(s)) {
-//					r.setP2pAmount(new BigDecimal(s));
-//					r.setP2pServiceAmount(new BigDecimal(s1));
-//					r.setDescription(desc);
-//				}
-//				r.setP2pDraft(true);
-//			}
-//
-//		});
-
         List<WmScorePackage> wmList = page.getRecords();
         List<Future<WmScorePackage>> futureList = new ArrayList<>(wmList.size());
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaskController.java

@@ -1,10 +1,6 @@
 package com.qunzhixinxi.hnqz.admin.controller;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.text.CharSequenceUtil;
-import cn.hutool.core.text.StrPool;
-import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.excel.EasyExcel;
@@ -23,7 +19,6 @@ import com.qunzhixinxi.hnqz.admin.api.constant.MqConstants;
 import com.qunzhixinxi.hnqz.admin.api.dto.SysCheckChainNodeCheckHistoryDTO;
 import com.qunzhixinxi.hnqz.admin.api.dto.WmTaskDTO;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
-import com.qunzhixinxi.hnqz.admin.api.entity.SysDictItem;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysFile;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmReportOpt;
@@ -35,31 +30,19 @@ import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEnt;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaHospital;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmReport;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackage;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackageSettleNote;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTask;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskContent;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskContentConfig;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskRule;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskType;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmUserSign;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmUserSignDetail;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmWkAlbum;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmWkArticle;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmWkArticleShare;
 import com.qunzhixinxi.hnqz.admin.api.entity.XlsPackageInfo;
 import com.qunzhixinxi.hnqz.admin.api.entity.XlsTask;
 import com.qunzhixinxi.hnqz.admin.api.dto.CommonEvidenceDTO;
 import com.qunzhixinxi.hnqz.admin.api.model.excel.CommonTaskExcelModel;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.DelEnum;
-import com.qunzhixinxi.hnqz.admin.api.constant.enums.EnableEnum;
-import com.qunzhixinxi.hnqz.admin.api.constant.enums.SettleStatusEnum;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.TaskStatusEnum;
-import com.qunzhixinxi.hnqz.admin.api.constant.enums.UserSignPurposeEnum;
-import com.qunzhixinxi.hnqz.admin.api.constant.enums.UserSignResultEnum;
 import com.qunzhixinxi.hnqz.admin.manager.SysCheckChainManager;
 import com.qunzhixinxi.hnqz.admin.mapper.WmTaskMapper;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
-import com.qunzhixinxi.hnqz.admin.service.SysDictItemService;
 import com.qunzhixinxi.hnqz.admin.service.SysFileService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserService;
 import com.qunzhixinxi.hnqz.admin.service.WmDaAgentService;
@@ -67,16 +50,10 @@ import com.qunzhixinxi.hnqz.admin.service.WmDaDistributionService;
 import com.qunzhixinxi.hnqz.admin.service.WmDaDrugEntService;
 import com.qunzhixinxi.hnqz.admin.service.WmDaHospitalService;
 import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
-import com.qunzhixinxi.hnqz.admin.service.WmTaskContentConfigService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskContentService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskRuleService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskTypeService;
-import com.qunzhixinxi.hnqz.admin.service.WmUserSignDetailService;
-import com.qunzhixinxi.hnqz.admin.service.WmUserSignService;
-import com.qunzhixinxi.hnqz.admin.service.WmWkAlbumService;
-import com.qunzhixinxi.hnqz.admin.service.WmWkArticleService;
-import com.qunzhixinxi.hnqz.admin.service.WmWkArticleShareService;
 import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
 import com.qunzhixinxi.hnqz.common.core.entity.BaseMap;
 import com.qunzhixinxi.hnqz.common.core.util.R;
@@ -127,19 +104,12 @@ import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 
 /**
@@ -166,13 +136,6 @@ public class WmTaskController {
     private final WmDaHospitalService wmDaHospitalService;
     private final WmDaDistributionService wmDaDistributionService;
     private final WmTaskContentService wmTaskContentService;
-    private final WmWkArticleService wmWkArticleService;
-    private final WmWkArticleShareService wmWkArticleShareService;
-    private final WmWkAlbumService wmWkAlbumService;
-    private final WmUserSignService wmUserSignService;
-    private final WmUserSignDetailService wmUserSignDetailService;
-    private final WmTaskContentConfigService wmTaskContentConfigService;
-    private final SysDictItemService sysDictItemService;
     private final SysFileService sysFileService;
     private final RabbitMqClient rabbitMqClient;
     private final RedisTemplate<String, String> redisTemplate;
@@ -196,7 +159,7 @@ public class WmTaskController {
         wmScorePackage.setRelationScoreId(wmScorePackage.getId());
         List<WmScorePackage> wmScorePackageList = wmScorePackageService.selectLists(wmScorePackage);
         List<WmTask> list = new ArrayList<>();
-        if (wmScorePackageList.size() > 0) {
+        if (CollUtil.isNotEmpty(wmScorePackageList)) {
             allScorePackageList.addAll(wmScorePackageList);
 
             WmTask wmTask3 = new WmTask();
@@ -217,13 +180,13 @@ public class WmTaskController {
 
                 List<String> ids3 = wmTaskList.stream().map(p -> p.getId()).collect(Collectors.toList());
 
-                if (wmScorePackageList1.size() > 0) {
+                if (CollUtil.isNotEmpty(wmScorePackageList1)) {
                     for (WmScorePackage subSubScorePackage : wmScorePackageList1) {
                         WmTask wmTask2 = new WmTask();
                         wmTask2.setScorePackageId(subSubScorePackage.getId());
                         List<WmTask> wmTaskList1 = wmTaskMapper.selectListByIds(wmTask2);
 
-                        List<String> ids5 = wmTaskList1.stream().map(p -> p.getId()).collect(Collectors.toList());
+                        List<String> ids5 = wmTaskList1.stream().map(WmTask::getId).collect(Collectors.toList());
                         for (String id2 : ids5) {
                             WmTask wmTaskList2 = wmTaskMapper.selectByRealFlag(Integer.parseInt(id2));
                             list.add(wmTaskList2);
@@ -263,8 +226,8 @@ public class WmTaskController {
 
         // 每页数据条数
         Page<WmTask> page1 = new Page<>();
-        int current = new Long(page.getCurrent()).intValue();
-        int size = new Long(page.getSize()).intValue();
+        int current = Long.valueOf(page.getCurrent()).intValue();
+        int size = Long.valueOf(page.getSize()).intValue();
 
         int count = list.size();
         List<WmTask> pageList = new ArrayList<>();