api更新

sop-business/src/main/java/com/qmth/sop/business/bean/result/TBDelayWarnResult.java

@@ -3,6 +3,7 @@ package com.qmth.sop.business.bean.result;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.sop.business.entity.TBDelayWarn;
+import com.qmth.sop.business.entity.TBDelayWarnDetail;
 import com.qmth.sop.common.base.BaseEntity;
 import com.qmth.sop.common.enums.DelayWarnStatusEnum;
 import com.qmth.sop.common.enums.DelayWarnTypeEnum;
@@ -11,6 +12,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -42,6 +45,9 @@ public class TBDelayWarnResult extends TBDelayWarn implements Serializable {
     @ApiModelProperty(value = "项目名称")
     private String crmName;
 
+    @ApiModelProperty(value = "跟进记录")
+    List<TBDelayWarnDetail> tbDelayWarnDetails=new ArrayList<>();
+
     public String getService() {
         return service;
     }
@@ -81,4 +87,12 @@ public class TBDelayWarnResult extends TBDelayWarn implements Serializable {
     public void setCrmName(String crmName) {
         this.crmName = crmName;
     }
+
+    public List<TBDelayWarnDetail> getTbDelayWarnDetails() {
+        return tbDelayWarnDetails;
+    }
+
+    public void setTbDelayWarnDetails(List<TBDelayWarnDetail> tbDelayWarnDetails) {
+        this.tbDelayWarnDetails = tbDelayWarnDetails;
+    }
 }

sop-business/src/main/java/com/qmth/sop/business/bean/result/TBViolationResult.java

@@ -2,11 +2,14 @@ package com.qmth.sop.business.bean.result;
 
 import com.qmth.sop.business.entity.TBDelayWarn;
 import com.qmth.sop.business.entity.TBViolation;
+import com.qmth.sop.business.entity.TBViolationDetail;
 import com.qmth.sop.common.enums.ProductTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -43,6 +46,8 @@ public class TBViolationResult extends TBViolation implements Serializable {
 
     @ApiModelProperty(value = "登记人")
     private String createName;
+    @ApiModelProperty(value = "跟进记录")
+    private List<TBViolationDetail> tbViolationDetails=new ArrayList<>();
 
     public String getService() {
         return service;
@@ -99,4 +104,12 @@ public class TBViolationResult extends TBViolation implements Serializable {
     public void setMobileNumber(String mobileNumber) {
         this.mobileNumber = mobileNumber;
     }
+
+    public List<TBViolationDetail> getTbViolationDetails() {
+        return tbViolationDetails;
+    }
+
+    public void setTbViolationDetails(List<TBViolationDetail> tbViolationDetails) {
+        this.tbViolationDetails = tbViolationDetails;
+    }
 }

sop-business/src/main/java/com/qmth/sop/business/service/SequenceService.java

@@ -37,4 +37,6 @@ public interface SequenceService extends IService<Sequence> {
      * @return
      */
     String createCrmCode(String crm) throws InterruptedException;
+
+    String createCode(String name) throws InterruptedException;
 }

sop-business/src/main/java/com/qmth/sop/business/service/TBDelayWarnService.java

@@ -45,4 +45,5 @@ public interface TBDelayWarnService extends IService<TBDelayWarn>{
     Boolean delete(Long id);
 
 
+    TBDelayWarnResult get(long id);
 }

sop-business/src/main/java/com/qmth/sop/business/service/TBViolationService.java

@@ -45,5 +45,5 @@ public interface TBViolationService extends IService<TBViolation>{
     Boolean delete(Long id);
 
 
-
+    TBViolationResult get(long id);
 }

sop-business/src/main/java/com/qmth/sop/business/service/impl/SequenceServiceImpl.java

@@ -92,4 +92,11 @@ public class SequenceServiceImpl extends ServiceImpl<SequenceMapper, Sequence> i
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("流程编码长度未设置"));
         return String.format("%0" + sysConfig.getConfigValue() + "d", this.selectNextVal(crm));
     }
+
+    @Override
+    public String createCode(String name) throws InterruptedException {
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.FLOW_CODE_LENGTH);
+        Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("流程编码长度未设置"));
+        return String.format("%0" + sysConfig.getConfigValue() + "d", this.selectNextVal(name));
+    }
 }

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDelayWarnServiceImpl.java

@@ -1,12 +1,15 @@
 package com.qmth.sop.business.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.sop.business.bean.result.TBDelayWarnResult;
 import com.qmth.sop.business.entity.SysUser;
 import com.qmth.sop.business.entity.TBDelayWarn;
+import com.qmth.sop.business.entity.TBDelayWarnDetail;
 import com.qmth.sop.business.mapper.TBDelayWarnMapper;
+import com.qmth.sop.business.service.TBDelayWarnDetailService;
 import com.qmth.sop.business.service.TBDelayWarnService;
 import com.qmth.sop.common.enums.DelayWarnStatusEnum;
 import com.qmth.sop.common.enums.DelayWarnTypeEnum;
@@ -18,6 +21,8 @@ import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -33,6 +38,9 @@ import java.util.Objects;
 @Service
 public class TBDelayWarnServiceImpl extends ServiceImpl<TBDelayWarnMapper, TBDelayWarn> implements TBDelayWarnService {
 
+    @Resource
+    TBDelayWarnDetailService
+            tBDelayWarnDetailService;
 
     /**
      * 查询列表
@@ -41,8 +49,8 @@ public class TBDelayWarnServiceImpl extends ServiceImpl<TBDelayWarnMapper, TBDel
      * @return
      */
     @Override
-    public IPage<TBDelayWarnResult> query(IPage<Map> iPage, DelayWarnTypeEnum type, DelayWarnStatusEnum status, Long serviceId, String custom, String fieldObj, String sopNo, Long startTime, Long endTime,Long id) {
-        return this.baseMapper.query(iPage, Objects.nonNull(type) ? type.name() : null, Objects.nonNull(status) ? status.name() : null, serviceId, custom, fieldObj, sopNo, startTime, endTime,id);
+    public IPage<TBDelayWarnResult> query(IPage<Map> iPage, DelayWarnTypeEnum type, DelayWarnStatusEnum status, Long serviceId, String custom, String fieldObj, String sopNo, Long startTime, Long endTime, Long id) {
+        return this.baseMapper.query(iPage, Objects.nonNull(type) ? type.name() : null, Objects.nonNull(status) ? status.name() : null, serviceId, custom, fieldObj, sopNo, startTime, endTime, id);
     }
 
     /**
@@ -87,5 +95,15 @@ public class TBDelayWarnServiceImpl extends ServiceImpl<TBDelayWarnMapper, TBDel
         return this.removeById(id);
     }
 
+    @Override
+    public TBDelayWarnResult get(long id) {
+        IPage<TBDelayWarnResult> resultIPage = query(new Page<>(1, 1), null, null, null, null, null, null, null, null, id);
+        TBDelayWarnResult tbDelayWarnResult = resultIPage.getRecords().get(0);
+        List<TBDelayWarnDetail> tbDelayWarnDetails = tBDelayWarnDetailService.list(id);
+        tbDelayWarnResult.setTbDelayWarnDetails(tbDelayWarnDetails);
+        return tbDelayWarnResult;
+
+    }
+
 
 }

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBViolationServiceImpl.java

@@ -1,5 +1,6 @@
 package com.qmth.sop.business.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,9 +9,11 @@ import com.qmth.sop.business.bean.result.TBViolationResult;
 import com.qmth.sop.business.entity.SysMessage;
 import com.qmth.sop.business.entity.SysUser;
 import com.qmth.sop.business.entity.TBViolation;
+import com.qmth.sop.business.entity.TBViolationDetail;
 import com.qmth.sop.business.mapper.TBViolationMapper;
 import com.qmth.sop.business.service.SequenceService;
 import com.qmth.sop.business.service.SysMessageService;
+import com.qmth.sop.business.service.TBViolationDetailService;
 import com.qmth.sop.business.service.TBViolationService;
 import com.qmth.sop.business.util.SmsSendUtil;
 import com.qmth.sop.common.contant.SystemConstant;
@@ -22,10 +25,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * sop违规登记表 服务实现.
@@ -47,6 +47,9 @@ public class TBViolationServiceImpl extends ServiceImpl<TBViolationMapper, TBVio
     @Resource
     SequenceService sequenceService;
 
+    @Resource
+    TBViolationDetailService tbViolationDetailService;
+
     /**
      * 查询列表
      *
@@ -71,11 +74,10 @@ public class TBViolationServiceImpl extends ServiceImpl<TBViolationMapper, TBVio
         try {
              SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
             if (Objects.isNull(tBViolation.getId())) {// 新增
-                tBViolation.setCode(sequenceService.selectNextVal("violationFlow").toString());
+                tBViolation.setCode(sequenceService.createCode("violationFlow"));
                 tBViolation.insertInfo(sysUser.getId());
                 saveOrUpdate(tBViolation);
-                IPage<TBViolationResult> resultIPage = this.query(new Page<>(1, 1), null, null, null, null, null, null, null, null, null, tBViolation.getId());
-                TBViolationResult tbViolationResult = resultIPage.getRecords().get(0);
+                TBViolationResult tbViolationResult = get(tBViolation.getId());
 
 //                String content = MessageEnum.NOTICE_OF_VIOLATION_REMIND.getTemplate();
 //                content = content.replaceAll("\\$\\{userName\\}", tbViolationResult.getUserName());
@@ -128,4 +130,13 @@ public class TBViolationServiceImpl extends ServiceImpl<TBViolationMapper, TBVio
         return this.removeById(id);
     }
 
+    @Override
+    public TBViolationResult get(long id) {
+        IPage<TBViolationResult> resultIPage = this.query(new Page<>(1, 1), null, null, null, null, null, null, null, null, null,id);
+        TBViolationResult tbViolationResult = resultIPage.getRecords().get(0);
+        List<TBViolationDetail> TBViolationDetails = tbViolationDetailService.list(new QueryWrapper<TBViolationDetail>().lambda().eq(TBViolationDetail::getViolationId, id).orderByDesc(TBViolationDetail::getCreateTime));
+        tbViolationResult.setTbViolationDetails(TBViolationDetails);
+        return tbViolationResult;
+    }
+
 }

sop-server/src/main/java/com/qmth/sop/server/api/TBDelayWarnController.java

@@ -64,8 +64,8 @@ public class TBDelayWarnController {
     @RequestMapping(value = "/get", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "延期预警跟进表信息", response = TBDelayWarnResult.class)})
     public Result get(@ApiParam(value = "延期预警跟进表id", required = true) @RequestParam long id) {
-        IPage<TBDelayWarnResult> resultIPage = tBDelayWarnService.query(new Page<>(1, 1), null, null, null, null, null, null, null, null, id);
-        return ResultUtil.ok(resultIPage.getRecords().get(0));
+
+        return ResultUtil.ok(tBDelayWarnService.get(id));
     }
 
     //关闭延期预警跟进

sop-server/src/main/java/com/qmth/sop/server/api/TBDelayWarnDetailController.java

@@ -3,6 +3,7 @@ package com.qmth.sop.server.api;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.sop.business.entity.TBDelayWarnDetail;
+import com.qmth.sop.business.entity.TBViolationDetail;
 import com.qmth.sop.business.service.TBDelayWarnDetailService;
 import com.qmth.sop.common.contant.SystemConstant;
 import com.qmth.sop.common.util.Result;
@@ -38,8 +39,8 @@ public class TBDelayWarnDetailController {
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "延期预警明细表查询结果", response = TBDelayWarnDetail.class)})
     public Result list(@ApiParam(value = "延期预警表id", required = true) @RequestParam(required = true) long id) {
-        List<TBDelayWarnDetail> resultIPage = tBDelayWarnDetailService.list(id);
-        return ResultUtil.ok(resultIPage);
+        List<TBDelayWarnDetail> tbDelayWarnDetails = tBDelayWarnDetailService.list(id);
+        return ResultUtil.ok(tbDelayWarnDetails);
     }
 
 

sop-server/src/main/java/com/qmth/sop/server/api/TBViolationController.java

@@ -99,8 +99,7 @@ public class TBViolationController {
     @RequestMapping(value = "/get", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "sop违规登记表信息", response = TBViolationResult.class)})
     public Result get(@ApiParam(value = "sop违规登记表id", required = true) @RequestParam long id) {
-        IPage<TBViolationResult> resultIPage = tBViolationService.query(new Page<>(1, 1), null, null, null, null, null, null, null, null, null, id);
-        return ResultUtil.ok(resultIPage.getRecords().get(0));
+        return ResultUtil.ok(tBViolationService.get(id));
     }