三单

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

@@ -4,6 +4,8 @@ import com.rongwei.bsentity.domain.ZhcxPmqManagementDistributionDetailDo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.rwcommon.base.R;
 
+import java.util.Map;
+
 /**
  * <p>
  * 三单管理_派发质检确认人 服务类
@@ -31,4 +33,11 @@ public interface ZhcxPmqManagementDistributionDetailService extends IService<Zhc
      * @param id DISTRIBUTION_DETAIL_id
      */
     R updateClosedStateInThirdFloor(String id);
+
+    /**
+     * 三单执行页面改派
+     * @param map
+     * @return
+     */
+    R reassignment(Map<String, Object> map);
 }

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

@@ -26,4 +26,12 @@ public interface ZhcxPmqManagementLogService extends IService<ZhcxPmqManagementL
      * @param type 操作类型
      */
     R logFoThirdFloor(String id,String type);
+
+    /**
+     * 三单执行页面记录操作日志
+     * @param id ZHCX_PMQ_MANAGEMENT_DISTRIBUTION_DETAIL_id
+     * @param type 操作类型
+     * @param description 操作描述
+     */
+    R logFoThirdFloor(String id,String type,String description);
 }

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

@@ -1,11 +1,8 @@
 package com.rongwei.bscommon.sys.service.impl;
 
-import com.rongwei.bscommon.sys.service.ZhcxPmqManagementDistributionService;
-import com.rongwei.bscommon.sys.service.ZhcxPmqManagementRecoredService;
-import com.rongwei.bscommon.sys.service.ZhcxPmqManagementService;
+import com.rongwei.bscommon.sys.service.*;
 import com.rongwei.bsentity.domain.ZhcxPmqManagementDistributionDetailDo;
 import com.rongwei.bscommon.sys.dao.ZhcxPmqManagementDistributionDetailDao;
-import com.rongwei.bscommon.sys.service.ZhcxPmqManagementDistributionDetailService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.rongwei.bsentity.domain.ZhcxPmqManagementDistributionDo;
 import com.rongwei.bsentity.domain.ZhcxPmqManagementDo;
@@ -15,6 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -42,6 +40,9 @@ public class ZhcxPmqManagementDistributionDetailServiceImpl extends ServiceImpl<
     @Autowired
     private ZhcxPmqManagementDistributionService managementDistributionService;
 
+    @Autowired
+    private ZhcxPmqManagementLogService logService;
+
     @Override
     public R updateClosedStateInFirstFloor(String id) {
         // 根据pid获取第二层未关闭的数量
@@ -84,4 +85,28 @@ public class ZhcxPmqManagementDistributionDetailServiceImpl extends ServiceImpl<
         updateClosedStateInSecondFloor(detailDo.getPid());
         return R.ok("更新状态成功");
     }
+
+    @Override
+    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");
+        ZhcxPmqManagementDistributionDetailDo detailDo = this.getById(id);
+        // 新的改派人
+        String confirmer = detailDo.getConfirmer();
+        String confirmerid = detailDo.getConfirmerid();
+        ZhcxPmqManagementDistributionDo distributionDo = managementDistributionService.getById(detailDo.getDistributid());
+        // 插入改派日志
+        logService.logFoThirdFloor(id,"改派",detailDo.getDescription());
+        // 替换第2.5层的
+        distributionDo.setConfirmer(distributionDo.getConfirmer().replace(older,confirmer));
+        distributionDo.setConfirmerid(distributionDo.getConfirmerid().replace(olderId,confirmerid));
+        distributionDo.setRemark("执行改派");
+        managementDistributionService.updateById(distributionDo);
+        // 将备注说明制空
+        detailDo.setDescription(" ");
+        this.updateById(detailDo);
+        return R.ok("操作成功");
+    }
 }

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

@@ -86,4 +86,30 @@ public class ZhcxPmqManagementLogServiceImpl extends ServiceImpl<ZhcxPmqManageme
         log.info("记录日志");
         return R.ok("记录日志");
     }
+
+    @Override
+    public R logFoThirdFloor(String id, String type,String description) {
+        ZhcxPmqManagementDistributionDetailDo detailDo = detailService.getById(id);
+        ZhcxPmqManagementRecoredDo recoredDo = recoredService.getById(detailDo.getPid());
+        Date nowDate = DateUtil.parse(DateUtil.now(), "yyyy-MM-dd HH:mm:ss");
+        // 获取当前操作人
+        SysUserVo currentUser = CommonUtils.getCurrentUser();
+        if(Objects.isNull(currentUser) || StringUtils.isEmpty(currentUser.getId())){
+            return R.error("无法获取当前操作人");
+        }
+        ZhcxPmqManagementLogDo zhcxPmqManagementLogDo = new ZhcxPmqManagementLogDo();
+        zhcxPmqManagementLogDo.setId(SecurityUtil.getUUID())
+                .setOperator(currentUser.getName())
+                .setOperatorid(currentUser.getId())
+                .setOperationtype(type)
+                .setOperationtime(nowDate)
+                .setPmqmid(recoredDo.getPmqmid())
+                .setRecoredid(recoredDo.getId())
+                .setDistributionid(detailDo.getDistributid())
+                .setDetailid(id)
+                .setDescription(description);
+        this.save(zhcxPmqManagementLogDo);
+        log.info("记录日志");
+        return R.ok("记录日志");
+    }
 }

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

@@ -2,6 +2,7 @@ package com.rongwei.bsserver.controller;
 
 
 import com.rongwei.bscommon.sys.service.ZhcxPmqManagementDistributionDetailService;
+import com.rongwei.bscommon.sys.service.ZhcxPmqManagementLogService;
 import com.rongwei.bscommon.sys.service.ZhcxPmqManagementRecoredService;
 import com.rongwei.rwcommon.base.R;
 import io.swagger.annotations.ApiOperation;
@@ -34,6 +35,9 @@ public class ZhcxPmqManagementController {
     @Autowired
     private ZhcxPmqManagementDistributionDetailService distributionDetailService;
 
+    @Autowired
+    private ZhcxPmqManagementLogService logService;
+
     @PostMapping("/generateDistributionDetail")
     @ApiOperation("第二层生成三单派单数据")
     public R generateDistributionDetail(@RequestBody Map<String,Object> map){
@@ -52,6 +56,11 @@ public class ZhcxPmqManagementController {
         }
     }
 
+    /**
+     * 三单执行页面关闭之后的操作接口
+     * @param map
+     * @return
+     */
     @PostMapping("/updateClosedStateInThirdFloor")
     @ApiOperation("更新关闭状态-第三层(在已保存状态的情况后)")
     public R updateClosedStateInThirdFloor(@RequestBody Map<String,Object> map){
@@ -60,10 +69,33 @@ public class ZhcxPmqManagementController {
                 return R.error("id不能为空");
             }
             log.info("更新关闭状态-第三层(在已保存状态的情况后)__>map:{}",map.get("id"));
+            // 塞入操作日志
+            logService.logFoThirdFloor((String) map.get("id"),"关闭");
             return distributionDetailService.updateClosedStateInThirdFloor((String) map.get("id"));
         } catch (Exception e) {
             log.info(String.valueOf(e));
-            return R.error("生成三单派单数据异常");
+            return R.error("更新关闭状态-第三层(在已保存状态的情况后)数据异常");
+        }
+    }
+
+
+    /**
+     * 三单执行页面改派
+     * @param map
+     * @return
+     */
+    @PostMapping("/reassignment")
+    @ApiOperation("三单执行页面改派")
+    public R reassignment(@RequestBody Map<String,Object> map){
+        try {
+            if(Objects.isNull(map.get("id"))){
+                return R.error("id不能为空");
+            }
+            log.info("三单执行页面改派__>map:{}",map.get("id"));
+            return distributionDetailService.reassignment(map);
+        } catch (Exception e) {
+            log.info(String.valueOf(e));
+            return R.error("三单执行页面改派异常");
         }
     }
 }