修改 质量模块问题。

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java

@@ -4,10 +4,13 @@
 package org.springblade.desk.quality.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
+import org.springblade.desk.util.json.serializer.Integer0ToEmptyStringSerializer;
+import org.springblade.desk.util.json.serializer.IntegerAllToStringSerializer;
 
 import java.io.Serial;
 import java.math.BigDecimal;
@@ -113,5 +116,6 @@ public class AuditFile extends BaseEntity {
      * 产品应用领域
      */
     @Schema(description = "产品应用领域")
+    @JsonSerialize(using = Integer0ToEmptyStringSerializer.class)
     private Integer prodApplyArea;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java

@@ -227,6 +227,18 @@ public class LiquidTankTask extends BaseEntity {
 	 * 备注
 	 */
     public static final String COL_REMARK = "REMARK";
+    /**
+     * 撤回原因
+     */
+    public static final String COL_REVOKE_REASON = "REVOKE_REASON";
+    /**
+     * 首次填报时间
+     */
+    public static final String COL_FIRST_FILL_DATE = "FIRST_FILL_DATE";
+    /**
+     * 复检填报时间
+     */
+    public static final String COL_REPEAT_FILL_DATE = "REPEAT_FILL_DATE";
 
 	/**
 	 * [槽液检测任务]编码
@@ -478,4 +490,19 @@ public class LiquidTankTask extends BaseEntity {
 	 */
 	@Schema(description = "备注")
 	private String remark;
+    /**
+     * 撤回原因
+     */
+    @Schema(description = "撤回原因")
+    private String revokeReason;
+    /**
+     * 首次填报时间
+     */
+    @Schema(description = "首次填报时间")
+    private LocalDateTime firstFillDate;
+    /**
+     * 复检填报时间
+     */
+    @Schema(description = "复检填报时间")
+    private LocalDateTime repeatFillDate;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RemindMsg.java

@@ -6,9 +6,12 @@ package org.springblade.desk.quality.pojo.entity;
 import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.math.BigDecimal;
+
 import org.springblade.core.mp.base.BaseEntity;
 import lombok.EqualsAndHashCode;
+
 import java.io.Serial;
 
 /**
@@ -102,6 +105,10 @@ public class RemindMsg extends BaseEntity {
      * 参数4
      */
     public static final String COL_PARAM_4 = "PARAM_4";
+    /**
+     * [零件]名称
+     */
+    public static final String PART_NAME = "PART_NAME";
 
     /**
      * 编码
@@ -198,4 +205,9 @@ public class RemindMsg extends BaseEntity {
      */
     @Schema(description = "参数4")
     private String param4;
+    /**
+     * [零件]名称
+     */
+    @Schema(description = "[零件]名称")
+    private String partName;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java

@@ -3,10 +3,12 @@ package org.springblade.desk.quality.pojo.request;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springblade.desk.quality.pojo.entity.AuditFile;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public class AuditFileSearch extends AuditFile {
 
     @Schema(description = "")

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestItemSubmit.java

@@ -3,10 +3,12 @@ package org.springblade.desk.quality.pojo.request;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springblade.desk.quality.pojo.entity.CycleTestItem;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public class CycleTestItemSubmit extends CycleTestItem {
 
     /**

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestSubmit.java

@@ -3,10 +3,12 @@ package org.springblade.desk.quality.pojo.request;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springblade.desk.quality.pojo.entity.CycleTest;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public class CycleTestSubmit extends CycleTest {
 
     /**

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

@@ -22,11 +22,6 @@ public class RemindMsgVO extends RemindMsg {
     @Serial
     private static final long serialVersionUID = 1L;
 
-    /**
-     * todo:
-     */
-    @Schema(description = "零件名称")
-    private String partName = "";
     @Schema(description = "材料名称")
     private String matName = "";
     @Schema(description = "镀种名称")

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ITeamSetService.java

@@ -93,4 +93,12 @@ public interface ITeamSetService extends BaseService<TeamSet> {
      * @return
      */
     R setExChangeTime(Long id, String exChangeTime);
+
+    /**
+     * 获取班组长[用户]id
+     *
+     * @param id
+     * @return
+     */
+    Long getTeamSetLeader(Long id);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/TeamSetServiceImpl.java

@@ -24,6 +24,7 @@ import org.springblade.desk.basic.pojo.vo.TeamSetVO;
 import org.springblade.desk.basic.service.IRelTeamSetUserService;
 import org.springblade.desk.basic.service.ITeamSetService;
 import org.springblade.desk.order.pojo.entity.YieldPlan;
+import org.springblade.system.feign.IUserClient;
 import org.springblade.system.pojo.entity.User;
 import org.springframework.stereotype.Service;
 
@@ -45,6 +46,9 @@ public class TeamSetServiceImpl extends BaseServiceImpl<TeamSetMapper, TeamSet>
     @Resource
     private IRelTeamSetUserService relTeamSetUserService;
 
+    @Resource
+    private IUserClient userClient;
+
     @Override
     public IPage<TeamSetVO> selectTeamSetPage(IPage<TeamSetVO> page, TeamSetVO teamSet) {
         return page.setRecords(baseMapper.selectTeamSetPage(page, teamSet));
@@ -107,4 +111,12 @@ public class TeamSetServiceImpl extends BaseServiceImpl<TeamSetMapper, TeamSet>
         f.setExChangeTime(exChangeTime);
         return R.status(updateById(f));
     }
+
+    @Override
+    public Long getTeamSetLeader(Long id) {
+        TeamSet f = getById(id);
+        // todo:班组长 都为管理员
+        // return f.getTeamLeader();
+        return 2004027390417698818L;
+    }
 }

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

@@ -5,4 +5,6 @@ public interface AuditFileConst {
     Integer S_NORMAL = 1;
 
     Integer S_ABANDON = 2;
+
+    String DICT_KEY = "AuditFile-Status";
 }

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

@@ -28,7 +28,7 @@ public interface LiquidTankTaskConst {
      */
     Integer S_PENDING_TEST = 2;
     /**
-     * 状态-已填报，待自动计算加药量-检测员填报 不显示
+     * 状态-已填报，待自动计算加药量-检测员填报 UI不显示
      */
     Integer S_DATA_FIRST = 3;
     /**
@@ -40,7 +40,7 @@ public interface LiquidTankTaskConst {
      */
     Integer S_PENDING_REVIEW = 5;
     /**
-     * 状态-:已经通过加药量审核，待领药-工艺员同意
+     * 状态-已经通过加药量审核，待领药-工艺员同意
      */
     Integer S_PENDING_SEND_DRUG = 6;
     /**
@@ -74,6 +74,7 @@ public interface LiquidTankTaskConst {
      */
     Integer FILL_DATA_SECOND = 2;
 
+    Integer REVIEW_INIT = 0;
     Integer REVIEW_YES = 1;
     Integer REVIEW_NO = 2;
     /**

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

@@ -3,6 +3,7 @@
  */
 package org.springblade.desk.quality.controller;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -84,20 +85,8 @@ public class AuditFileController extends BladeController {
     public R<IPage<AuditFileVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> map,
                                       Query query) {
         // QueryWrapper<AuditFile> qw = Condition.getQueryWrapper(map, AuditFile.class);
-        AuditFileSearch search = new AuditFileSearch();
-        // todo: Func 用法
-        if (map.containsKey(AuditFile.COL_PPS_ID)) {
-            search.setPpsId(Func.toLong(map.get(AuditFile.COL_PPS_ID)));
-        }
-        if (map.containsKey(AuditFile.COL_PQ_ID)) {
-            search.setPqId(Func.toLong(map.get(AuditFile.COL_PQ_ID)));
-        }
-        if (map.containsKey(BaseRequest.KEEP_USER_REAL_NAME)) {
-            search.setKeepUserRealName(Func.toStr(map.get(BaseRequest.KEEP_USER_REAL_NAME)));
-        }
-        if (map.containsKey(BaseCol.STATUS)) {
-            search.setStatus(Func.toInt(map.get(BaseCol.STATUS)));
-        }
+        AuditFileSearch search = BeanUtil.toBeanIgnoreError(map, AuditFileSearch.class);
+        log.info("search = " + search);
         IPage<AuditFile> pages = service.listSearch(Condition.getPage(query), search);
         IPage<AuditFileVO> pagesVO = AuditFileWrapper.build().pageVO(pages);
         pagesVO.getRecords()
@@ -140,6 +129,7 @@ public class AuditFileController extends BladeController {
     @Operation(summary = "新增一条", description = "传入AuditFile Obj")
     public R save(@Valid @RequestBody AuditFile addOne) {
         addOne.setId(null);
+        log.info("addOne = {}", addOne);
         return R.status(service.save(addOne));
     }
 

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

@@ -83,8 +83,11 @@ public class RemindMsgController extends BladeController {
     public R<IPage<RemindMsgVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> map,
                                       Query query) {
         RemindMsgSearch search = BeanUtil.toBean(map, RemindMsgSearch.class);
+        if (map.containsKey("partName")) {
             String partName = map.get("partName").toString();
+        }
         QueryWrapper<RemindMsg> qw = Condition.getQueryWrapper(map, RemindMsg.class);
+        qw.like(map.containsKey("partName"), RemindMsg.PART_NAME, map.get("partName"));
         IPage<RemindMsg> pages = service.page(Condition.getPage(query), qw);
         IPage<RemindMsgVO> pagesVO = RemindMsgWrapper.build().pageVO(pages);
         pagesVO.getRecords()

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml

@@ -33,7 +33,12 @@
         FROM QA_AUDIT_FILE f
         LEFT JOIN BLADE_USER u
         ON (f.CREATE_USER = u.ID OR f.UPDATE_USER = u.ID)
-        WHERE (f.IS_DELETED = 0 AND u.IS_DELETED = 0)
+        WHERE (
+        f.IS_DELETED = 0
+        )
+        <if test="q.status != null">
+            AND f.STATUS = #{q.status}
+        </if>
         <if test="q.ppsId != null">
             AND f.PPS_ID = #{q.ppsId}
         </if>

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml

@@ -56,6 +56,9 @@
         <result column="REVIEW_OPINION" property="reviewOpinion"/>
         <result column="REVIEW_PASS" property="reviewPass"/>
         <result column="REMARK" property="remark"/>
+        <result column="REVOKE_REASON" property="revokeReason"/>
+        <result column="FIRST_FILL_DATE" property="firstFillDate"/>
+        <result column="REPEAT_FILL_DATE" property="repeatFillDate"/>
     </resultMap>
 
     <select id="selectLiquidTankTaskPage" resultMap="liquidTankTaskResultMap">

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

@@ -37,6 +37,4 @@ public interface RemindMsgMapper extends BaseMapper<RemindMsg> {
 	 * @return List<RemindMsgExcel>
 	 */
 	List<RemindMsgExcel> exportRemindMsg(@Param("ew") Wrapper<RemindMsg> queryWrapper);
-
-
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RemindMsgMapper.xml

@@ -24,6 +24,7 @@
         <result column="PARAM_2" property="param2"/>
         <result column="PARAM_3" property="param3"/>
         <result column="PARAM_4" property="param4"/>
+        <result column="PART_NAME" property="partName"/>
     </resultMap>
 
     <select id="selectRemindMsgPage" resultMap="remindMsgResultMap">

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml

@@ -108,16 +108,16 @@
         <if test="q.prodIdent != null and q.prodIdent != ''"> <!-- todo -->
             AND wo.XXXX = #{q.prodIdent}
         </if>
-        <if test="q.batchNo != null">
+        <if test="q.batchNo != null"> <!-- todo -->
             AND rs.BATCH_NO = #{q.batchNo}
         </if>
-        <if test="q.cardNo != null">
+        <if test="q.cardNo != null"> <!-- todo -->
             AND wo.CARD_NO = #{q.cardNo}
         </if>
-        <if test="q.createTimeStart != null">
+        <if test="q.createTimeStart != null"> <!-- todo -->
             AND rs.CREATE_TIME &gt;= #{q.createTimeStart}
         </if>
-        <if test="q.createTimeEnd != null">
+        <if test="q.createTimeEnd != null"> <!-- todo -->
             AND rs.CREATE_TIME &lt;= #{q.createTimeEnd}
         </if>
         <if test="q.reviewTimeStart != null">

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

@@ -92,20 +92,23 @@ public class LiquidTankTaskSetVoService {
                 vo.setProcessUserRealName(processUI.getUser().getRealName());
             }
         }
+        // 审核人
         if (IdUtil.isValid(vo.getReviewUserId())) {
             UserInfo reviewUI = userClient.userInfo(vo.getReviewUserId()).getData();
             if (reviewUI != null) {
                 vo.setReviewUserRealName(reviewUI.getUser().getRealName());
             }
         }
+        // 发药人
         if (IdUtil.isValid(vo.getSendDrugUserId())) {
             UserInfo sendUI = userClient.userInfo(vo.getSendDrugUserId()).getData();
             if (sendUI != null) {
                 vo.setSendDurgUserRealName(sendUI.getUser().getRealName());
             }
         }
-        if (IdUtil.isValid(vo.getReviewUserId())) {
-            UserInfo receiveUI = userClient.userInfo(vo.getReviewUserId()).getData();
+        // 领药人
+        if (IdUtil.isValid(vo.getReceiveDrugUserId())) {
+            UserInfo receiveUI = userClient.userInfo(vo.getReceiveDrugUserId()).getData();
             if (receiveUI != null) {
                 vo.setReceiveDurgUserRealName(receiveUI.getUser().getRealName());
             }

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

@@ -64,7 +64,7 @@ public class AuditFileServiceImpl extends EnBaseServiceImpl<AuditFileMapper, Aud
 
     @Override
     public void setVOValue(AuditFileVO vo) {
-        vo.setBase(setBaseVOValue(userClient, sysClient, dictClient, vo, "AuditFile-Status"));
+        vo.setBase(setBaseVOValue(userClient, sysClient, dictClient, vo, AuditFileConst.DICT_KEY));
     }
 
     @Override

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

@@ -75,8 +75,10 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
     private IWorkTankService workTankService;
     @Resource
     private ITeamSetService teamSetService;
+
     @Resource
     private IDictClient dictClient;
+
     @Resource
     private LiquidTankTaskSetVoService setVoService;
 
@@ -130,7 +132,7 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
         for (LiquidTankTask task : list) {
             // todo:
             // basicChangeStatus(task.getId(), LiquidTankTaskConst.S_DATA_FIRST);
-            // todo:计算加药量,通过公式 公式尚未实现
+            // todo:计算加药量,通过公式 公式尚未实现 公式计算的。
             // task.setAddUnit(1000);
             task.setNeedAddValue(1000.0);
 //            basicChangeStatus(task.getId(), );
@@ -138,6 +140,7 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
             // 首次化验时间
             // task.setFirstTestDate(LocalDateTime.now());
 //            basicUpdateById(task);
+            task.setFirstFillDate(LocalDateTime.now());
             updateById(task);
         }
         return R.success();
@@ -161,7 +164,7 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
         List<Long> list = Func.toLongList(ids);
         for (Long id : list) {
             LiquidTankTask task = baseMapper.selectById(id);
-            if (reviewPass == LiquidTankTaskConst.REVIEW_YES) {
+            if (Objects.equals(reviewPass, LiquidTankTaskConst.REVIEW_YES)) {
                 // todo: flag
                 // todo: 是否需要加药？
                 // 审核通过
@@ -169,7 +172,7 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
                 // basicChangeStatus(task.getId(), LiquidTankTaskConst.S_PENDING_SEND_DRUG);
                 task.setStatus(LiquidTankTaskConst.S_PENDING_SEND_DRUG);
                 // task.setStatus(LiquidTankTaskConst.STATE_FINISH_OK);
-            } else if (reviewPass == LiquidTankTaskConst.REVIEW_NO) {
+            } else if (Objects.equals(reviewPass, LiquidTankTaskConst.REVIEW_NO)) {
                 // todo: flag
                 // 审核不通过
                 task.setReviewPass(LiquidTankTaskConst.REVIEW_NO);
@@ -177,6 +180,7 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
                 task.setStatus(LiquidTankTaskConst.S_PENDING_EDIT_DRUG);
             }
             task.setReviewOpinion(reviewOpinion);
+            // 审核人
             task.setReviewUserId(AuthUtil.getUserId());
             // 审核时间
             task.setReviewDate(LocalDateTime.now());
@@ -189,10 +193,11 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
     @Override
     public R revoke(Long id, String revokeReason) {
         LiquidTankTask task = baseMapper.selectById(id);
-        // 审核不通过
-        task.setReviewPass(LiquidTankTaskConst.REVIEW_NO);
+        // 审核初始化
+        task.setReviewPass(LiquidTankTaskConst.REVIEW_INIT);
         task.setStatus(LiquidTankTaskConst.S_PENDING_EDIT_DRUG);
 //        basicChangeStatus(task.getId(), LiquidTankTaskConst.S_PENDING_REVIEW);
+        updateById(task);
         return R.success();
     }
 
@@ -215,11 +220,14 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
     @Transactional
     @Override
     public R receiveDrugBat(List<LiquidTankTask> list) {
+        // 用户权限过滤
         for (LiquidTankTask task : list) {
             task.setStatus(LiquidTankTaskConst.S_PENDING_FILL_DATA_SECOND);
             // basicChangeStatus(task.getId(), LiquidTankTaskConst.S_PENDING_FILL_DATA_SECOND);
-            //
-            task.setReceiveDrugUserId(AuthUtil.getUserId());
+            // 领药人 为指定班组 班组长
+            // task.setReceiveDrugUserId(AuthUtil.getUserId());
+            Long teamId = task.getTeamId();
+            task.setReceiveDrugUserId(teamSetService.getTeamSetLeader(teamId));
             // 领药时间
             task.setReceiveDrugDate(LocalDateTime.now());
             basicUpdateById(task);
@@ -233,10 +241,11 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
         for (LiquidTankTask task : list) {
             task.setStatus(LiquidTankTaskConst.S_FINISH_OK);
 //            basicChangeStatus(task.getId(), LiquidTankTaskConst.S_FINISH_OK);
-            // 复检化验时间
-            // task.setRepeatTestDate(LocalDateTime.now());
+            // 复检化验时间 用户填写
             // 结束时间
             task.setFinishDate(LocalDateTime.now());
+            // 复检填报时间
+            task.setRepeatFillDate(LocalDateTime.now());
             basicUpdateById(task);
         }
         return R.success();

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

@@ -63,13 +63,13 @@ public class RemindMsgServiceImpl extends BaseServiceImpl<RemindMsgMapper, Remin
     public void setVOValue(RemindMsgVO vo) {
         if (IdUtil.isValid(vo.getPartId())) {
             // todo: DsPartEntity.quota
-//            DsPartEntity part = dsPartService.getById(vo.getPartId());
-//            if (part != null) {
-//                vo.setPartName(part.getPartName());
-//                vo.setMatName(part.getMaterial());
-//                vo.setPlatingName(part.getPlate());
-//                vo.setProcessClazz1Name(part.getCraftWay());
-//            }
+            DsPartEntity part = dsPartService.getById(vo.getPartId());
+            if (part != null) {
+                vo.setPartName(part.getPartName());
+                vo.setMatName(part.getMaterial());
+                vo.setPlatingName(part.getPlate());
+                vo.setProcessClazz1Name(part.getCraftWay());
+            }
         }
     }
 }