init: init project step4: biz code support

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/WmTask.java

@@ -3,13 +3,12 @@ package com.qunzhixinxi.hnqz.admin.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
@@ -22,8 +21,7 @@ import java.util.Map;
  */
 @Data
 @TableName(value = "wm_task", autoResultMap = true)
-@EqualsAndHashCode(callSuper = true)
-public class WmTask extends Model<WmTask> {
+public class WmTask implements Serializable {
     private static final long serialVersionUID = 1L;
 
 

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

@@ -1147,7 +1147,7 @@ public class WmTaskController {
      */
     @SysLog("任务中心-生成报告并审批")
     @GetMapping("/saveAndUpdateWmReport")
-    public R saveAndUpdateWmReport(WmTask wmTask, WmReport wmReport) {
+    public R<?> saveAndUpdateWmReport(WmTask wmTask, WmReport wmReport) {
         return wmTaskService.saveAndUpdateWmReport(wmTask, wmReport);
     }
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/WmScorePackageMapper.java

@@ -110,7 +110,7 @@ public interface WmScorePackageMapper extends DataScopeMapper<WmScorePackage> {
 
     List<WmScorePackage> selectByRelationScoreIdList(String relationScoreId);
 
-	public List<WmScorePackage> getScorePackagekfpjf(@Param("query") WmScorePackage wmScorePackage);
+	List<WmScorePackage> getScorePackagekfpjf(@Param("query") WmScorePackage wmScorePackage);
 
 	IPage<WmScorePackage> getScorePackageList(Page page,@Param("query") WmScorePackage wmScorePackage);
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/WmTaskService.java

@@ -84,7 +84,7 @@ public interface WmTaskService extends IService<WmTask> {
 
     R saveAndUpdateWmTask(WmTask wmTask, WmReport wmReport);
 
-    R saveAndUpdateWmReport(WmTask wmTask, WmReport wmReport);
+    R<?> saveAndUpdateWmReport(WmTask wmTask, WmReport wmReport);
 
     R selectList(Page page, WmScorePackage wmScorePackage);
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskServiceImpl.java

@@ -386,8 +386,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
                     }
                 }
             }
-        }
-        else if (sysDept.getLevel() == 4) {
+        } else if (sysDept.getLevel() == 4) {
             // 二级CSO
             //if (Objects.nonNull(wmScorePackage.getDrugEntId())) {
             //    // 通过drugEntId为空，判断是否为药企发来的包，即药企->一级CSO->二级CSO的包
@@ -407,7 +406,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
             }
             for (String id : idList) {
                 List<WmScorePackage> wmScorePackageList1 = wmScorePackageMapper.selectByRelationScoreIdList(id);
-                List<String> idList1 = wmScorePackageList1.stream().map(p -> p.getId()).collect(Collectors.toList());
+                List<String> idList1 = wmScorePackageList1.stream().map(WmScorePackage::getId).collect(Collectors.toList());
                 for (String id1 : idList1) {
                     WmTask wmTask1 = new WmTask();
                     wmTask1.setTaskStatus(String.valueOf(3));
@@ -418,7 +417,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
                 }
             }
             for (WmTask wmTask1 : taskList) {
-                Integer reportSecondApprovalStatus = Integer.valueOf(wmTask1.getReportSecondApprovalStatus());
+                int reportSecondApprovalStatus = Integer.parseInt(wmTask1.getReportSecondApprovalStatus());
                 if (reportSecondApprovalStatus == 0) {
                     wmTask1.setExtIds(strs1);
                     wmTask1.setReportSecondApprovalStatus(String.valueOf(0));
@@ -426,8 +425,8 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
                     List<Map<String, Object>> wmTaskList = wmTaskMapper.selectByReportSecondApprovalStatus(wmTask1);
                     SysDept sysDept1 = sysDeptService.getById(wmScorePackage.getSendPackageDeptId());
                     String name1 = sysDept1.getName();
-                    if (wmTaskList.size() > 0) {
-                        Integer sum = 0;
+                    if (CollUtil.isNotEmpty(wmTaskList)) {
+                        int sum = 0;
                         Integer deptId = SecurityUtils.getUser().getDeptId();
                         Date date = new Date();
                         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
@@ -456,9 +455,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
                     }
                 }
             }
-        }
-
-        else if (sysDept.getLevel() == 2) {
+        } else if (sysDept.getLevel() == 2) {
             // 药企
             wmTask.setExtIds(strs1);
             wmTask.setTaskStatus(String.valueOf(3));
@@ -484,7 +481,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
                 }
             }
             for (WmTask wmTask1 : taskList) {
-                Integer reportDrugApprovalStatus = Integer.valueOf(wmTask1.getReportDrugApprovalStatus());
+                int reportDrugApprovalStatus = Integer.parseInt(wmTask1.getReportDrugApprovalStatus());
                 if (reportDrugApprovalStatus == 0) {
                     wmTask1.setExtIds(strs1);
                     wmTask1.setReportDrugApprovalStatus(String.valueOf(0));
@@ -492,8 +489,8 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
                     List<Map<String, Object>> wmTaskList = wmTaskMapper.selectByReportDrugApprovalStatus(wmTask1);
                     SysDept sysDept1 = sysDeptService.getById(wmScorePackage.getSendPackageDeptId());
                     String name1 = sysDept1.getName();
-                    if (wmTaskList.size() > 0) {
-                        Integer sum = 0;
+                    if (CollUtil.isNotEmpty(wmTaskList)) {
+                        int sum = 0;
                         Integer deptId = SecurityUtils.getUser().getDeptId();
                         Date date = new Date();
                         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
@@ -550,7 +547,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
     public R saveAndUpdateWmTask(WmTask wmTask, WmReport wmReport) {
         String packageId = wmTask.getScorePackageId();  // 获取积分包ID
         List<WmScorePackage> wmScorePackageList = wmScorePackageMapper.selectByRelationScoreIdList(packageId);
-        List<String> idList = wmScorePackageList.stream().map(p -> p.getId()).collect(Collectors.toList());
+        List<String> idList = wmScorePackageList.stream().map(WmScorePackage::getId).collect(Collectors.toList());
         idList.add(packageId);
         List<String> strs1 = new ArrayList<>();
 
@@ -1070,10 +1067,10 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
     }
 
     @Override
-    public R saveAndUpdateWmReport(WmTask wmTask, WmReport wmReport) {
+    public R<?> saveAndUpdateWmReport(WmTask wmTask, WmReport wmReport) {
         String packageId = wmTask.getScorePackageId();  // 获取积分包ID
         List<WmScorePackage> wmScorePackageList = wmScorePackageMapper.selectByRelationScoreIdList(packageId);
-        List<String> idList = wmScorePackageList.stream().map(p -> p.getId()).collect(Collectors.toList());
+        List<String> idList = wmScorePackageList.stream().map(WmScorePackage::getId).collect(Collectors.toList());
         idList.add(packageId);
         List<String> strs1 = new ArrayList<>();
 
@@ -1193,7 +1190,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
             }
             for (String id : idList) {
                 List<WmScorePackage> wmScorePackageList1 = wmScorePackageMapper.selectByRelationScoreIdList(id);
-                List<String> idList1 = wmScorePackageList1.stream().map(p -> p.getId()).collect(Collectors.toList());
+                List<String> idList1 = wmScorePackageList1.stream().map(WmScorePackage::getId).collect(Collectors.toList());
                 for (String id1 : idList1) {
                     WmTask wmTask1 = new WmTask();
                     wmTask1.setTaskStatus(String.valueOf(3));
@@ -1205,18 +1202,20 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
             }
             List<String> ids2 = taskList.stream()
                     .filter(task -> "0".equals(task.getReportSecondApprovalStatus()))
-                    .map(p -> p.getId())
+                    .map(WmTask::getId)
                     .collect(Collectors.toList());
 
             for (WmTask wmTask1 : taskList) {
-                Integer reportSecondApprovalStatus = Integer.valueOf(wmTask1.getReportSecondApprovalStatus());
-                if (reportSecondApprovalStatus == 0 && wmTask1.getReportOneId() == null) {
+                int reportSecondApprovalStatus = Integer.parseInt(wmTask1.getReportSecondApprovalStatus());
+                if (reportSecondApprovalStatus == 0/* && wmTask1.getReportOneId() == null*/) {
                     wmTask1.setExtIds(strs1);
-                    List<Map<String, Object>> wmTaskList = wmTaskMapper.selectByWmTaskSecond(wmTask1);
+                    wmTask1.setReportSecondApprovalStatus("0");
+                    wmTask1.setTaskStatus("3");
+                    List<Map<String, Object>> wmTaskList = wmTaskMapper.selectByReportSecondApprovalStatus(wmTask1);
                     String sendDeptId = wmScorePackage.getSendPackageDeptId();
-                    if (wmTaskList.size() > 0) {
-                        Integer total = 0;
-                        Integer sum = 0;
+                    if (CollUtil.isNotEmpty(wmTaskList)) {
+                        int total = 0;
+                        int sum = 0;
                         Integer deptId = SecurityUtils.getUser().getDeptId();
                         Date date = new Date();
                         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
@@ -1293,7 +1292,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
             }
             List<String> ids2 = taskList.stream()
                     .filter(task -> "0".equals(task.getReportDrugApprovalStatus()))
-                    .map(p -> p.getId())
+                    .map(WmTask::getId)
                     .collect(Collectors.toList());
 
             for (WmTask wmTask1 : taskList) {