fix supervisionMsg; fix batch taskSup

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmSupervisionManager.java

@@ -14,6 +14,7 @@ import com.itextpdf.text.PageSize;
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsState;
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType.AreaType;
 import com.qunzhixinxi.hnqz.admin.api.dto.WmSupervisionDto;
+import com.qunzhixinxi.hnqz.admin.api.dto.WmSupervisionDto.OnTaskSupervision;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysRole;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
@@ -1905,11 +1906,22 @@ public class WmSupervisionManager {
 
           m.put("modifiable", wmTaskSupervision.getModifiable());
 
+          SysUser supUser = userMap.get(wmTaskSupervision.getCreateBy());
+          SysUserRole supSysUserRole = userRoleMap.get(supUser.getUserId()).get(0);
+          SysRole supRole = roleMap.get(supSysUserRole.getRoleId());
+          String supRoleName =
+                (supRole == null
+                    ? " "
+                    : (StrUtil.isNotBlank(supRole.getRoleDesc())
+                        ? supRole.getRoleDesc()
+                        : supRole.getRoleName()));
           String supervisionMsg =
               String.format(
-                  "【%s】，%s",
-                  wmTaskSupervision.getSupervisionResult() ? "通过" : "不通过",
-                  wmTaskSupervision.getRemarks());
+                  "%s【%s】，审核【%s】，监督意见为【%s】(%s)。",
+                  supRoleName, supUser.getRealname(), 
+                  wmTaskSupervision.getSupervisionResult() ? " 通过 " : " 不通过 " , 
+                  StrUtil.isBlank(wmTaskSupervision.getRemarks()) ? " " : wmTaskSupervision.getRemarks(), 
+                  formatter.format(wmTaskSupervision.getCreateTime()));
 
           m.put("supervisionMessage", supervisionMsg);
 
@@ -2005,12 +2017,20 @@ public class WmSupervisionManager {
   public Boolean doTaskSupervisionBatch(
       WmSupervisionDto.OnTaskSupervisionBatch resource, HnqzUser user) {
 
+    Map<Long, WmTaskSupervision> task2sup = taskSupervisionService.list(Wrappers.<WmTaskSupervision>lambdaQuery()
+        .in(WmTaskSupervision::getSupervisionId, resource.getSupervisionIds()))
+        .stream().collect(Collectors.toMap(WmTaskSupervision::getSupervisionId, Function.identity()));
+
     resource
         .getSupervisionIds()
         .forEach(
             id -> {
-              taskSupervisionService.updateSupervision(
-                  id, resource.getRemarks(), !resource.getSupervision(), user);
+                OnTaskSupervision single = new WmSupervisionDto.OnTaskSupervision();
+                single.setPkgId(task2sup.get(id).getPackageId());
+                single.setRemarks(resource.getRemarks());
+                single.setSupervision(resource.getSupervision());
+                single.setTaskId(task2sup.get(id).getTaskId());
+                doTaskSupervision(single, user);
             });
     return true;
   }