预警提交

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckCustomerDataController.java

@@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -69,6 +70,12 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
     @Autowired
     private ISmsCheckCustomerInfoService infoService;
     @Autowired
+    private SmsWarningCustomerDataService warningCustomerDataService;
+    @Autowired
+    private SmsWarningCheckCustomerDataLogService warningCheckCustomerDataLogService;
+    @Autowired
+    private SmsCheckCustomerInfoBecomeDueService dueService;
+    @Autowired
     private ISmsCheckCustomerDataService customerDataService;
     @Autowired
     private ISmsCheckCustomerInfoService iSmsCheckCustomerInfoService;
@@ -458,7 +465,22 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
         }
         return vo;
     }
-
+    private Map<String,String>getMapWarningByResult(SmsWarningCheckCustomerDataLog log){
+        HashMap <String,String> map =new HashMap<>();
+        if (StringUtils.isNotBlank(log.getContractDateResult() ) && !log.getContractDateResult().equals("1")){
+            map.put("合同到期时间结果","未通过");
+        }
+        if (StringUtils.isNotBlank(log.getCodeNumberDateResult() ) && !log.getCodeNumberDateResult().equals("1")){
+            map.put("码号证书到期时间结果","未通过");
+        }
+        if (StringUtils.isNotBlank(log.getFilingsDateResult() ) && !log.getFilingsDateResult().equals("1")){
+            map.put("备案通知到期时间结果","未通过");
+        }
+        if (StringUtils.isNotBlank(log.getPermitDateResult() ) && !log.getPermitDateResult().equals("1")){
+            map.put("增值业务许可证到期时间结果","未通过");
+        }
+        return map;
+    }
     private Map<String,String>getMapByResult(SmsCheckCustomerDataLog smsCheckCustomerDataLog){
         HashMap <String,String> map =new HashMap<>();
         if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getContractDateResult() ) && !smsCheckCustomerDataLog.getContractDateResult().equals("1")){
@@ -694,6 +716,115 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
         }
         return Result.OK(map);
     }
+
+
+
+    @ApiOperation(value = "客户资料-通过id查询", notes = "客户资料-通过客户表id查询")
+    @GetMapping(value = "/queryWarningDataLogByInfoId")
+    public Result<Map<String, Object>> queryWarningDatalogByInfoId(@RequestParam(name = "dueId") String dueId) {
+        Map<String, Object> map =new HashMap<>();
+        LambdaQueryWrapper<SmsWarningCustomerData> queryWrapperData = new LambdaQueryWrapper<>();
+        queryWrapperData.eq(SmsWarningCustomerData::getDueId, dueId);
+        SmsWarningCustomerData warningCustomerData = warningCustomerDataService.getOne(queryWrapperData);
+
+        //任务数据
+       // SmsCheckCustomerInfo byId = infoService.getById(infoId);
+        SmsCheckCustomerInfoBecomeDue byId = dueService.getById(dueId);
+        SmsCheckCustomerInfo infoData = infoService.getById(byId.getInfoId());
+
+        //查询 稽核结果数据
+        LambdaQueryWrapper<SmsWarningCheckCustomerDataLog> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SmsWarningCheckCustomerDataLog::getDueId, dueId);
+        SmsWarningCheckCustomerDataLog warningCheckCustomerDataLog = warningCheckCustomerDataLogService.getOne(queryWrapper);
+
+        Map<String, Object> stringObjectMap = BeanUtil.beanToMap(warningCheckCustomerDataLog);
+        Map<String, Object> stringObjectMap1 = BeanUtil.beanToMap(warningCustomerData);
+        if (warningCustomerData!=null){
+            map.put("dataId",warningCustomerData.getId());
+            map.putAll(stringObjectMap1);
+        }
+        if (warningCheckCustomerDataLog!=null){
+            map.put("logId",warningCheckCustomerDataLog.getId());
+            stringObjectMap.remove("id");
+            map.putAll(stringObjectMap);
+        }
+        map.put("infoDataStatus",infoData.getCheckState());
+//        map.put("taskId",byId.getTaskId());
+//        map.put("history",list);
+//        map.put("staffName",byId.getStaffName());
+//        map.put("customerNo",byId.getCustomerNo());
+//        map.put("networkAccessTime",byId.getNetworkAccessTime());
+        if (warningCustomerData == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(map);
+    }
+
+
+    @AutoLog(value = "客户资料-添加")
+    @ApiOperation(value = "客户资料-添加", notes = "客户资料-添加")
+    @PostMapping(value = "/addWarning")
+    public Result<String> addWarning(@RequestBody  JSONObject jsonObject) {
+        SmsWarningCustomerData smsWarningCustomerData = JSON.parseObject(jsonObject.toJSONString(), SmsWarningCustomerData.class);
+        boolean save = warningCustomerDataService.saveOrUpdate(smsWarningCustomerData);
+        if (save){
+            // 修改客户状态为     未完善/未上传
+            SmsCheckCustomerInfoBecomeDue smsCheckCustomerInfoBecomeDue = new SmsCheckCustomerInfoBecomeDue();
+            smsCheckCustomerInfoBecomeDue.setCheckState(CheckStateCode.CHECK_STSTE_2);
+            UpdateWrapper<SmsCheckCustomerInfoBecomeDue> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.in("id", smsWarningCustomerData.getDueId()).set("check_state", CheckStateCode.CHECK_STSTE_2).set("update_time",new Date());
+            dueService.update(updateWrapper);
+            return Result.OK();
+        }
+        return Result.error("新增失败");
+    }
+
+
+
+    @AutoLog(value = "预警资料-稽核")
+    @ApiOperation(value = "预警资料-稽核", notes = "预警资料-稽核")
+    @PostMapping(value = "/addWarningLog")
+    public Result<String> addWarningLog(@RequestBody JSONObject jsonObject) throws IllegalAccessException {
+        SmsWarningCheckCustomerDataLogAndData warningCheckCustomerDataLog = JSON.parseObject(jsonObject.toJSONString(), SmsWarningCheckCustomerDataLogAndData.class);
+        SmsWarningCheckCustomerDataLog smsWarningCheckCustomerDataLog = new SmsWarningCheckCustomerDataLog();
+        BeanUtils.copyProperties(warningCheckCustomerDataLog,smsWarningCheckCustomerDataLog);
+        smsWarningCheckCustomerDataLog.setId(warningCheckCustomerDataLog.getLogId());
+        boolean saveLog = warningCheckCustomerDataLogService.saveOrUpdate(smsWarningCheckCustomerDataLog);
+        if (saveLog){
+            Map<String, String> mapByResult = getMapWarningByResult(smsWarningCheckCustomerDataLog);
+            /** 稽核状态 0：未处理；1：未完善；2：待稽核；3：已整改；4：待整改；5：稽核通过；  */
+            SmsCheckCustomerInfoBecomeDue byId = dueService.getById(warningCheckCustomerDataLog.getDueId());
+            if (byId.getCheckState()==4){
+                byId.setCheckState(CheckStateCode.CHECK_STSTE_2);
+            }else {
+                if (mapByResult.isEmpty()){
+                    byId.setCheckState(CheckStateCode.CHECK_STSTE_5);
+                    LambdaQueryWrapper<SmsCheckCustomerData> queryWrapper = new LambdaQueryWrapper<>();
+                    queryWrapper.eq(SmsCheckCustomerData::getInfoId, byId.getInfoId());
+                    SmsCheckCustomerData smsCheckCustomerData = customerDataService.getOne(queryWrapper);
+
+                    smsCheckCustomerData.setContractDateDate(warningCheckCustomerDataLog.getContractDateDate());
+                    smsCheckCustomerData.setContractDateDateIs(warningCheckCustomerDataLog.getContractDateDateIs());
+
+                    smsCheckCustomerData.setCodeNumberDateDate(warningCheckCustomerDataLog.getCodeNumberDateDate());
+                    smsCheckCustomerData.setCodeNumberDateDateIs(warningCheckCustomerDataLog.getCodeNumberDateDateIs());
+
+                    smsCheckCustomerData.setFilingsDateDate(warningCheckCustomerDataLog.getFilingsDateDate());
+                    smsCheckCustomerData.setFilingsDateDateIs(warningCheckCustomerDataLog.getFilingsDateDateIs());
+
+                    smsCheckCustomerData.setPermitDateDate(warningCheckCustomerDataLog.getPermitDateDate());
+                    smsCheckCustomerData.setPermitDateDateIs(warningCheckCustomerDataLog.getPermitDateDateIs());
+                }else {
+                    byId.setCheckState(CheckStateCode.CHECK_STSTE_4);
+                }
+            }
+            UpdateWrapper<SmsCheckCustomerInfoBecomeDue> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.in("id", byId.getId()).set("check_state", byId.getCheckState()).set("update_time",new Date());
+            dueService.update(updateWrapper);
+            return Result.OK();
+        }
+        return Result.error("新增失败");
+    }
     /**
      * 导出excel
      *

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckCustomerInfoController.java

@@ -1648,6 +1648,16 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         Page<SmsCheckCustomerInfoBecomeDueAndInfo> smsCheckCustomerInfoBecomeDueAndInfoPage = new Page<SmsCheckCustomerInfoBecomeDueAndInfo>(pageNo, pageSize).setRecords(infoList);
         return Result.ok(smsCheckCustomerInfoBecomeDueAndInfoPage);
     }
+
+
+    @ApiOperation(value = "预警信息", notes = "预警信息")
+    @GetMapping(value = "/warningById")
+    @PermissionData(pageComponent = "warningList/TaskCheckList")
+    public   Result<SmsCheckCustomerInfoBecomeDue>  warningById(@RequestParam(name = "id") String id ) {
+        SmsCheckCustomerInfoBecomeDue byId = dueService.getById(id);
+        return Result.ok(byId);
+    }
+
     @ApiOperation(value = "客户信息-通过id查询 稽核统计数", notes = "客户信息-通过id查询 稽核统计数")
     @GetMapping(value = "/WarningCount")
     @PermissionData(pageComponent = "warningList/TaskCheckList")

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsWarningCheckCustomerDataLog.java

@@ -35,4 +35,14 @@ public class SmsWarningCheckCustomerDataLog {
     private String contractOrProveResultRemark;
     private String trunkContractResult;
     private String trunkContractResultRemark ;
+
+    private String warningInfo;
+    private String warningInfoRemark;
+    private String lotWarningInfo;
+    private String lotWarningInfoRemark;
+    private String truckWarningInfo;
+    private String truckWarningInfoRemark;
+
+
+
 }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsWarningCheckCustomerDataLogAndData.java

@@ -0,0 +1,78 @@
+package org.jeecg.modules.smscheck.entity;
+
+import lombok.Data;
+
+@Data
+public class SmsWarningCheckCustomerDataLogAndData {
+
+    private String   logId;
+    private String infoId;
+    private String dataId;
+    private String contractDateResult;
+    private String contractDateResultRemark;
+    private String codeNumberDateResult;
+    private String codeNumberDateResultRemark;
+    private String filingsDateResultRemark;
+    private String filingsDateResult;
+    private String permitDateResultRemark;
+    private String permitDateResult;
+    private String dueId;
+    private String contractResult;
+    private String contractResultRemark;
+    private String zZBusinessLicenseResult;
+    private String zZBusinessLicenseResultRemark;
+    private String contractOrProveResult;
+    private String contractOrProveResultRemark;
+    private String trunkContractResult;
+    private String trunkContractResultRemark ;
+
+    private String warningInfo;
+    private String warningInfoRemark;
+    private String lotWarningInfo;
+    private String lotWarningInfoRemark;
+    private String truckWarningInfo;
+    private String truckWarningInfoRemark;
+
+
+    private String staffId;
+    private String staffNo;
+    private String createBy;
+    private String createTime;
+    private String updateBy;
+    private String updateTime;
+    private String sysOrgCode;
+    private String userNo;
+    private String contractDate;
+    private String codeNumberDate;
+    private String filingsDate;
+    private String permitDate;
+    private String contractDateRemark;
+    private String codeNumberDateRemark;
+    private String filingsDateRemark;
+    private String permitDateRemark;
+    private String contractDateDate;
+    private String contractDateDateIs;
+    private String codeNumberDateDate;
+    private String codeNumberDateDateIs;
+    private String filingsDateDate;
+    private String filingsDateDateIs;
+    private String permitDateDateIs;
+    private String permitDateDate;
+
+    private String lotContractDateIs;
+    private String lotContractDate;
+    private String lotContract;
+    private String lotContractRemark;
+    private String truckHouseDate;
+    private String truckContractOrProve;
+    private String truckContractOrProveRemark;
+    private String trunkContract;
+    private String trunkContractRemark;
+    private String trunkContractDateIs;
+    private String trunkContractDate;
+    private String zZBusinessLicense;
+    private String zZBusinessLicenseRemark;
+    private String zZBusinessLicenseDate;
+
+
+}