diff --git a/lidee-module/lidee-module-biz/src/main/java/com/lideeyunji/module/biz/controller/DevGzbxController.java b/lidee-module/lidee-module-biz/src/main/java/com/lideeyunji/module/biz/controller/DevGzbxController.java index 9c0b85d..10e6cc7 100644 --- a/lidee-module/lidee-module-biz/src/main/java/com/lideeyunji/module/biz/controller/DevGzbxController.java +++ b/lidee-module/lidee-module-biz/src/main/java/com/lideeyunji/module/biz/controller/DevGzbxController.java @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; import java.util.Map; /** @@ -50,4 +51,26 @@ public class DevGzbxController { return BaseWebResult.success("审批成功"); } + + @PostMapping("/process") + public BaseWebResult process(@RequestBody Map model) { + Long id = lideeYunJiUtils.getMap2Long(model, "faultId"); + if(id == null){ + return BaseWebResult.error(FrameErrorCodeConstants.FRAME_OP_ERROR); + } + List> data = devGzbxService.process(id); + return BaseWebResult.success(data); + } + + + @PostMapping("/processGd") + public BaseWebResult processGd(@RequestBody Map model) { + Long id = lideeYunJiUtils.getMap2Long(model, "faultId"); + if(id == null){ + return BaseWebResult.error(FrameErrorCodeConstants.FRAME_OP_ERROR); + } + List> data = devGzbxService.processGd(id); + return BaseWebResult.success(data); + } + } diff --git a/lidee-module/lidee-module-biz/src/main/java/com/lideeyunji/module/biz/service/DevGzbxService.java b/lidee-module/lidee-module-biz/src/main/java/com/lideeyunji/module/biz/service/DevGzbxService.java index 6288df6..e3027c7 100644 --- a/lidee-module/lidee-module-biz/src/main/java/com/lideeyunji/module/biz/service/DevGzbxService.java +++ b/lidee-module/lidee-module-biz/src/main/java/com/lideeyunji/module/biz/service/DevGzbxService.java @@ -1,5 +1,8 @@ package com.lideeyunji.module.biz.service; +import java.util.List; +import java.util.Map; + /** * 故障报修 Service 接口 * @@ -11,4 +14,8 @@ public interface DevGzbxService { void auditNotPass(Long id); void orderAuditNotPass(Long id); + + List> process(Long id); + + List> processGd(Long id); } diff --git a/lidee-module/lidee-module-biz/src/main/java/com/lideeyunji/module/biz/service/impl/DevGzbxServiceImpl.java b/lidee-module/lidee-module-biz/src/main/java/com/lideeyunji/module/biz/service/impl/DevGzbxServiceImpl.java index 10e74cb..b9d324d 100644 --- a/lidee-module/lidee-module-biz/src/main/java/com/lideeyunji/module/biz/service/impl/DevGzbxServiceImpl.java +++ b/lidee-module/lidee-module-biz/src/main/java/com/lideeyunji/module/biz/service/impl/DevGzbxServiceImpl.java @@ -5,12 +5,18 @@ import com.lideeyunji.module.biz.entity.DevGzbxWxgdDO; import com.lideeyunji.module.biz.mapper.DevGzbxMapper; import com.lideeyunji.module.biz.mapper.DevGzbxWxgdMapper; import com.lideeyunji.module.biz.service.DevGzbxService; +import com.lideeyunji.service.system.api.IApiAdminUserApi; import com.lideeyunji.tool.framework.yunji.enums.AcceptanceStatusEnum; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * 参数配置 Service 实现类 */ @@ -24,6 +30,8 @@ public class DevGzbxServiceImpl implements DevGzbxService { @Resource private DevGzbxWxgdMapper devGzbxWxgdMapper; + @Resource + private IApiAdminUserApi userApi; @Override public void auditNotPass(Long id) { @@ -41,4 +49,115 @@ public class DevGzbxServiceImpl implements DevGzbxService { devGzbxWxgdMapper.updateById(wxgd); } + @Override + public List> process(Long id) { + List> result = new ArrayList<>(); + DevGzbxDO devGzbxDO = devGzbxMapper.selectById(id); + DevGzbxWxgdDO gd = devGzbxWxgdMapper.selectOne("gzbx_id", id); + Map model = new HashMap<>(); + model.put("nodeName", "车间主任审批"); + model.put("spr",userApi.getUser(devGzbxDO.getLeaderUserId())); + model.put("status", "current"); + model.put("comment", "-"); + if(devGzbxDO.getLeaderUserZt() == 1){ + model.put("status", "approved"); + model.put("comment", devGzbxDO.getLeaderUserYj()); + } + result.add(model); + + Map model1 = new HashMap<>(); + model1.put("nodeName", "指定部门审批"); + model1.put("spr",userApi.getUser(devGzbxDO.getAssignDeptLeader())); + model1.put("status", "current"); + model1.put("comment", "-"); + if(devGzbxDO.getAssignUserZt() == 1){ + model1.put("status", "approved"); + model1.put("comment", devGzbxDO.getAssignUserYj()); + } + result.add(model1); + + Map model4 = new HashMap<>(); + model4.put("nodeName", "车间主任验收"); + model4.put("status", "current"); + model4.put("comment", "-"); + + Map model5 = new HashMap<>(); + model5.put("nodeName", "指定部门验收"); + model5.put("status", "current"); + model5.put("comment", "-"); + if (gd != null){ + model4.put("spr",userApi.getUser(gd.getLeaderUserId())); + if(gd.getLeaderYsZt() == 1){ + model4.put("status", "approved"); + model4.put("comment", gd.getLeaderYsYj()); + } + model5.put("spr",userApi.getUser(gd.getAssignDeptLeader())); + if(gd.getAssignYsZt() == 1){ + model5.put("status", "approved"); + model5.put("comment", gd.getAssignYsYj()); + } + } + result.add(model4); + result.add(model5); + return result; + } + + @Override + public List> processGd(Long id) { + List> result = new ArrayList<>(); + DevGzbxWxgdDO devGzbxWxgdDO = devGzbxWxgdMapper.selectById(id); + Long gzbxId = devGzbxWxgdDO.getGzbxId(); + + Map model = new HashMap<>(); + model.put("nodeName", "车间主任审批"); + model.put("status", "approved"); + model.put("comment", "-"); + + Map model1 = new HashMap<>(); + model1.put("nodeName", "指定部门审批"); + model1.put("status", "approved"); + model1.put("comment", "-"); + + Map model4 = new HashMap<>(); + model4.put("nodeName", "车间主任验收"); + model4.put("status", "current"); + model4.put("comment", "-"); + model4.put("spr",userApi.getUser(devGzbxWxgdDO.getLeaderUserId())); + if(devGzbxWxgdDO.getLeaderYsZt() == 1){ + model4.put("status", "approved"); + model4.put("comment", devGzbxWxgdDO.getLeaderYsYj()); + } + + Map model5 = new HashMap<>(); + model5.put("nodeName", "指定部门验收"); + model5.put("status", "current"); + model5.put("comment", "-"); + model5.put("spr",userApi.getUser(devGzbxWxgdDO.getAssignDeptLeader())); + if(devGzbxWxgdDO.getAssignYsZt() == 1){ + model5.put("status", "approved"); + model5.put("comment", devGzbxWxgdDO.getAssignYsYj()); + } + + if (gzbxId != null) { + DevGzbxDO devGzbxDO = devGzbxMapper.selectById(gzbxId); + model.put("comment", devGzbxDO.getLeaderUserYj()); + model.put("spr",userApi.getUser(devGzbxDO.getLeaderUserId())); + + model1.put("comment", devGzbxDO.getAssignUserYj()); + model1.put("spr",userApi.getUser(devGzbxDO.getAssignDeptLeader())); + }else { + model.put("comment", devGzbxWxgdDO.getLeaderYsYj()); + model.put("spr",userApi.getUser(devGzbxWxgdDO.getLeaderUserId())); + + model1.put("comment", devGzbxWxgdDO.getAssignYsYj()); + model1.put("spr",userApi.getUser(devGzbxWxgdDO.getAssignDeptLeader())); + } + + result.add(model); + result.add(model1); + result.add(model4); + result.add(model5); + return result; + } + }