Merge remote-tracking branch 'origin/featCnbg-supervFilter-20250325' into cnbg-master

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

@@ -1975,7 +1975,8 @@ private Page<WmTask> getReviewTaskPage(WmSupervisionDto.OnTaskSupervisionPage qu
       String remarks = resource.getRemarks();
 
       // 如果监督记录创建人不是当前人，就记录监督意见
-      if (!StrUtil.equals(operator.getUsername(), supervision.getCreateBy())) {
+      if (!StrUtil.equals(operator.getUsername(), supervision.getCreateBy())
+        && !CollUtil.containsAny(Arrays.asList(operator.getRoles()), List.of(49, 52, 53, 56))) { // 监督员
         modifiable = !resource.getSupervision();
         if (resource.getSupervision()) {
             remarks = supervision.getSupervisionResult() ? "同意监督结果，监督无异常" : "同意监督结果，不符合合规要求，不建议结算";
@@ -1987,13 +1988,13 @@ private Page<WmTask> getReviewTaskPage(WmSupervisionDto.OnTaskSupervisionPage qu
             supervision.getSupervisionId(), resource, supervision.getRemarks(), operator);
         
         taskSupervisionService.updateSupervision(
-            supervision.getSupervisionId(), supervision.getRemarks(), modifiable, operator);
+            supervision.getSupervisionId(), supervision.getRemarks(), modifiable, supervision.getSupervisionResult(), operator);
       
       } else {
         // 监察员重新提交，删除历史的审核意见
         taskSupervisionAdviceService.delAdvice(supervision.getSupervisionId(), operator);
         taskSupervisionService.updateSupervision(
-            supervision.getSupervisionId(), remarks, modifiable, operator);
+            supervision.getSupervisionId(), remarks, modifiable, resource.getSupervision(), operator);
       }
      
     }

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

@@ -40,7 +40,7 @@ public interface WmTaskSupervisionService extends IService<WmTaskSupervision> {
      * @param modifiable    是否可编辑
      * @param operator      操作人
      */
-    void updateSupervision(Long supervisionId, String remarks, Boolean modifiable, HnqzUser operator);
+    void updateSupervision(Long supervisionId, String remarks, Boolean modifiable, Boolean result, HnqzUser operator);
 
     /**
      * 按包查询监督信息

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

@@ -77,7 +77,7 @@ public class WmTaskSupervisionServiceImpl extends ServiceImpl<WmTaskSupervisionM
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateSupervision(Long supervisionId, String remarks, Boolean modifiable, HnqzUser operator) {
+    public void updateSupervision(Long supervisionId, String remarks, Boolean modifiable, Boolean result, HnqzUser operator) {
 
         UpmsState.TaskSupervisionState state = UpmsState.TaskSupervisionState.INIT;
         if (!modifiable) {
@@ -102,6 +102,7 @@ public class WmTaskSupervisionServiceImpl extends ServiceImpl<WmTaskSupervisionM
         taskSupervision.setSupervisionId(supervisionId);
         taskSupervision.setRemarks(remarks);
         taskSupervision.setModifiable(modifiable);
+        taskSupervision.setSupervisionResult(result);
         taskSupervision.setSupervisionState(state);
         taskSupervision.setUpdateBy(operator.getUsername());
         taskSupervision.setUpdateTime(LocalDateTime.now());