三单

business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxPmqManagementDistributionDetailService.java

@@ -36,7 +36,7 @@ public interface ZhcxPmqManagementDistributionDetailService extends IService<Zhc
 
     /**
      * 三单执行页面改派
-     * @param map
+     * @param map 参数
      * @return
      */
     R reassignment(Map<String, Object> map);
@@ -47,4 +47,11 @@ public interface ZhcxPmqManagementDistributionDetailService extends IService<Zhc
      * @return 数据
      */
     R getDataByTime(String data);
+
+    /**
+     * 三单执行页面修改关闭状态
+     * @param map 参数
+     * @return
+     */
+    R updateDetailStatus(Map<String, Object> map);
 }

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxPmqManagementDistributionDetailServiceImpl.java

@@ -9,6 +9,7 @@ import com.rongwei.bsentity.domain.ZhcxPmqManagementDo;
 import com.rongwei.bsentity.domain.ZhcxPmqManagementRecoredDo;
 import com.rongwei.bsentity.vo.pmq.ZhcxPmqManagementDistributionDetailVo;
 import com.rongwei.rwcommon.base.R;
+import com.rongwei.rwcommon.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -95,8 +96,8 @@ public class ZhcxPmqManagementDistributionDetailServiceImpl extends ServiceImpl<
     public R reassignment(Map<String, Object> map) {
         String id = (String) map.get("id");
         // 原始改派人
-        String older = (String) map.get("older");
-        String olderId = (String) map.get("olderId");
+        //String older = (String) map.get("older");
+        //String olderId = (String) map.get("olderId");
         ZhcxPmqManagementDistributionDetailDo detailDo = this.getById(id);
         // 新的改派人
         String confirmer = detailDo.getConfirmer();
@@ -126,4 +127,33 @@ public class ZhcxPmqManagementDistributionDetailServiceImpl extends ServiceImpl<
             return R.ok(list);
         }
     }
+
+    @Override
+    public R updateDetailStatus(Map<String, Object> map) {
+        // 第三层表id
+        String id = (String) map.get("id");
+        ZhcxPmqManagementDistributionDetailDo detailDo = this.getById(id);
+        if(Objects.isNull(detailDo)){
+            return R.error("数据异常");
+        }
+        // 新旧状态
+        String olderStatus = (String) map.get("olderStatus");
+        String status = detailDo.getStatus();
+        // 第2.5层数据
+        /*ZhcxPmqManagementDistributionDo distributionDo = managementDistributionService.getById(detailDo.getDistributid());
+        distributionDo.setStatus(status);
+        distributionDo.setRemark("修改关闭状态");
+        managementDistributionService.updateById(distributionDo);*/
+        // 插入改派日志
+        String description = "修改关闭状态:"+olderStatus+"->"+status;
+        if(StringUtils.isNotBlank(detailDo.getDescription())){
+            description = description +";备注说明:"+detailDo.getDescription();
+        }
+        logService.logFoThirdFloor(id,"修改状态",description);
+        // 将备注说明制空
+        detailDo.setDescription(" ");
+        this.updateById(detailDo);
+        // 更新关闭状态
+        return this.updateClosedStateInThirdFloor(id);
+    }
 }

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxPmqManagementDistributionServiceImpl.java

@@ -75,7 +75,7 @@ public class ZhcxPmqManagementDistributionServiceImpl extends ServiceImpl<ZhcxPm
                             pid,
                             zhcxPmqManagementDistributionDo.getMachineid(),
                             zhcxPmqManagementDistributionDo.getConfirmerid());
-            if(details.size() > 2){return R.error("派单数据异常");}
+            if(details.size() > 2){return R.error("派单数据异常,含有脏数据");}
             if(details.isEmpty()){
                // 添加
                 ZhcxPmqManagementDistributionDetailDo add = new ZhcxPmqManagementDistributionDetailDo();

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxPmqManagementRecoredServiceImpl.java

@@ -441,7 +441,7 @@ public class ZhcxPmqManagementRecoredServiceImpl extends ServiceImpl<ZhcxPmqMana
 
     @Override
     public void updateClosedStatus() {
-        // 谨慎调用
+        // 谨慎调用 (真别调了 上次跑了36个小时)
         LambdaQueryWrapper<ZhcxPmqManagementRecoredDo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ZhcxPmqManagementRecoredDo::getDeleted,"0")
                 .eq(ZhcxPmqManagementRecoredDo::getDispatchstatus,"0")
@@ -492,7 +492,6 @@ public class ZhcxPmqManagementRecoredServiceImpl extends ServiceImpl<ZhcxPmqMana
                     result.setSupplement(zhcxPmqManagementDistributionDTO.getSupplement());
                 }
                 result.setRemark("批量派单");
-
                 resultList.add(result);
             }
         }

business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxPmqManagementController.java

@@ -113,5 +113,28 @@ public class ZhcxPmqManagementController {
             return R.error("三单页面数据回传异常");
         }
     }
+
+    /**
+     * 三单执行页面修改关闭状态
+     * @param map
+     * @return
+     */
+    @PostMapping("/updateDetailStatus")
+    @ApiOperation("三单执行页面修改关闭状态")
+    public R updateDetailStatus(@RequestBody Map<String,Object> map){
+        try {
+            if(Objects.isNull(map.get("id"))){
+                return R.error("id不能为空");
+            }
+            if(Objects.isNull(map.get("olderStatus"))){
+                return R.ok("历史关闭状态为空");
+            }
+            log.info("三单执行页面修改关闭状态__>map:{}",map.get("id"));
+            return distributionDetailService.updateDetailStatus(map);
+        } catch (Exception e) {
+            log.info(String.valueOf(e));
+            return R.error("三单执行页面修改关闭状态");
+        }
+    }
 }