槽液信息批量下发、消息通知增加部门名称

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/pojo/vo/NoticeVO.java

@@ -14,13 +14,16 @@ import org.springblade.desk.pojo.entity.Notice;
 @EqualsAndHashCode(callSuper = true)
 public class NoticeVO extends Notice {
 
-	@Schema(description = "通知类型名")
+    @Schema(description = "通知类型名")
-	private String categoryName;
+    private String categoryName;
 
-	@Schema(description = "租户编号")
+    @Schema(description = "租户编号")
-	private String tenantId;
+    private String tenantId;
 
-	@Schema(description = "创建人")
+    @Schema(description = "创建人")
-	private String createUserName;
+    private String createUserName;
+
+    @Schema(description = "创建部门")
+    private String createDeptName;
 
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/notice/mapper/NoticeMapper.xml

@@ -29,6 +29,7 @@
         <result column="title" property="title"/>
         <result column="content" property="content"/>
         <result column="create_user_name" property="createUserName"/>
+        <result column="create_dept_name" property="createDeptName"/>
     </resultMap>
 
     <select id="topList" resultMap="noticeResultMap">
@@ -55,10 +56,12 @@
     <select id="selectPageEw" resultMap="noticeVOResultMap">
         SELECT
             n.*,
-            bu.REAL_NAME as create_user_name
+            bu.REAL_NAME as create_user_name,
+            dept.dept_name as create_dept_name
         FROM
         blade_notice n
         LEFT JOIN blade_user bu on n.create_user = bu.id
+        LEFT JOIN BLADE_DEPT dept ON n.create_dept = dept.id
         ${ew.customSqlSegment}
     </select>
 

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java

@@ -351,6 +351,21 @@ public class LiquidTankTaskController extends BladeController {
         return service.generateManual(liquidTankId, testUserId);
     }
 
+    /**
+     * [槽液检测任务]
+     *
+     * @param liquidTankIds
+     * @param testUserId
+     * @return
+     */
+    @ApiOperationSupport(order = 101)
+    @PostMapping("/bulkGenerateManual")
+    @Operation(summary = "手动生成", description = "")
+    public R bulkGenerateManual(@Parameter(description = "槽液id", required = true) @RequestParam List<Long> liquidTankIds,
+                            @Parameter(description = "化验员id", required = true) @RequestParam Long testUserId) {
+        return service.bulkGenerateManual(liquidTankIds, testUserId);
+    }
+
     /**
      * [槽液检测任务]
      *

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskService.java

@@ -40,6 +40,8 @@ public interface ILiquidTankTaskService extends BaseService<LiquidTankTask> {
 
     R generateManual(Long liquidTankId, Long testUserId);
 
+    R bulkGenerateManual(List<Long> liquidTankIds, Long testUserId);
+
     R issueBat(String ids, Long testUserId);
 
     R accept(Long id);

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java

@@ -135,6 +135,23 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
         return R.status(basicSave(task));
     }
 
+    @Override
+    @Transactional
+    public R bulkGenerateManual(List<Long> liquidTankIds, Long testUserId) {
+        boolean result = true;
+        for (Long liquidTankId : liquidTankIds) {
+            LiquidTank lt = liquidTankService.getById(liquidTankId);
+            LiquidTankTask task = buildLiquidTankTask(lt, LiquidTankTaskConst.FROM_TYPE_MANUAL, testUserId);
+            boolean isSuccess = basicSave(task);
+            if (!isSuccess) {
+                result = false;
+                break;
+            }
+        }
+
+        return R.status(result);
+    }
+
     @Override
     public R issueBat(String ids, Long testUserId) {
         List<Long> list = Func.toLongList(ids);
@@ -220,7 +237,7 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
             if (liquidTank == null) {
                 return R.fail("槽液信息不存在");
             }
-            if(!AuthUtil.getUser().getUserId().equals(liquidTank.getProcessUserId())){
+            if (!AuthUtil.getUser().getUserId().equals(liquidTank.getProcessUserId())) {
                 return R.fail(task.getName() + ",您没有审批权限");
             }
             if (Objects.equals(reviewPass, LiquidTankTaskConst.REVIEW_YES)) {