预警 完成多少条 进行统计 整改率

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

@@ -74,6 +74,8 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
     @Autowired
     private SmsWarningCheckCustomerDataLogService warningCheckCustomerDataLogService;
     @Autowired
+    private SmsWarningCheckCustomerDataHistoryService warningCheckCustomerDataHistoryService;
+    @Autowired
     private SmsCheckCustomerInfoBecomeDueService dueService;
     @Autowired
     private ISmsCheckCustomerDataService customerDataService;
@@ -223,8 +225,6 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
         BeanUtils.copyProperties(smsCheckCustomerDataLog,smsCheckCustomerDataLogBill);
         smsCheckCustomerDataLogBill.setId(null);
         smsCheckCustomerDataLogBill.setCreateDate(new Date());
-        iSmsCheckCustomerDataLogBillService.save(smsCheckCustomerDataLogBill);
-
         boolean saveData = customerDataService.saveOrUpdate(smsCheckCustomerData);
 
 
@@ -240,6 +240,7 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
                     smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_5);
                 }else {
                     smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_4);
+                    iSmsCheckCustomerDataLogBillService.save(smsCheckCustomerDataLogBill);
                 }
             }
             smsCheckCustomerInfo.setId(byId.getId());
@@ -847,6 +848,11 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
                     customerDataService.update(updateWrapper);
                 }else {
                     byId.setCheckState(CheckStateCode.CHECK_STSTE_4);
+                    //添加history 表
+                    SmsWarningCheckCustomerDataHistory smsWarningCheckCustomerDataHistory = new SmsWarningCheckCustomerDataHistory();
+                    BeanUtils.copyProperties(warningCheckCustomerDataLog,smsWarningCheckCustomerDataHistory);
+                    smsWarningCheckCustomerDataHistory.setCreateTime(new Date());
+                    warningCheckCustomerDataHistoryService.save(smsWarningCheckCustomerDataHistory);
                 }
             }
             UpdateWrapper<SmsCheckCustomerInfoBecomeDue> updateWrapper = new UpdateWrapper<>();

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

@@ -1550,6 +1550,20 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         }
     }
 
+    @GetMapping(value = "/status/warningRefuse")
+    public Result<?> warningRefuse(@RequestParam Map<String, String> parameterMap) {
+        String startDate = parameterMap.get("startDate");
+        String endDate = parameterMap.get("endDate");
+        String taskId = parameterMap.get("taskId");
+        String taskType = parameterMap.get("taskType");
+        try {
+            List<SmsCustomerInfoGroupByCheckState> smsCustomerInfoGroupByCheckStates = customerInfoService.groupCheckStateWarning(startDate, endDate, taskId,taskType);
+            return Result.ok(smsCustomerInfoGroupByCheckStates);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     @GetMapping(value = "/status/getHistory")
     public Result<?> getHistory(@RequestParam Map<String, String> parameterMap, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,HttpServletRequest request) {
@@ -1609,6 +1623,14 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         return Result.ok(hashMap);
     }
 
+    @GetMapping(value = "/status/warningCountGroup")
+    public Result<?> warningCountGroup( @RequestParam Map<String, String> parameterMap) {
+
+        Map<String, Integer>   hashMap = customerInfoService.warningCountGroup(  parameterMap);
+
+        return Result.ok(hashMap);
+    }
+
     @GetMapping(value = "/status/getWarningCountOrg")
     public Result<?> getWarningCountOrg( @RequestParam Map<String, String> parameterMap) {
 

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

@@ -0,0 +1,51 @@
+package org.jeecg.modules.smscheck.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+@Data
+@TableName("sms_warning_check_customer_data_history")
+//不用带set和get前缀   user.name("aaa").age(18)
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "sms_warning_check_customer_data_history", description = "预警稽核类历史")
+public class SmsWarningCheckCustomerDataHistory {
+
+
+    private String   id;
+    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 Date createTime;
+
+
+}

tnc-sms/src/main/java/org/jeecg/modules/smscheck/mapper/SmsCheckCustomerInfoMapper.java

@@ -50,6 +50,10 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
     @SelectProvider(type = ProviderClass.class, method = "groupCheckState")
     List<SmsCustomerInfoGroupByCheckState> groupCheckState(String startDate, String endDate,String taskId,String taskType);
 
+
+    @SelectProvider(type = ProviderClass.class, method = "groupCheckStateWarning")
+    List<SmsCustomerInfoGroupByCheckState> groupCheckStateWarning(String startDate, String endDate,String taskId,String taskType);
+
     @SelectProvider(type = ProviderClass.class, method = "selectListPage")
     List<SmsCheckCustomerInfoBecomeDueAndInfo> selectListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo, SysPermissionDataRuleModel sysPermissionDataRuleModel, SysUser sysUser );
 
@@ -82,6 +86,8 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
     @SelectProvider(type = ProviderClass.class, method = "getWarningFiled")
     List<Map<String, Integer>> getWarningFiled(  Map<String, String> parameterMap );
 
+    @SelectProvider(type = ProviderClass.class, method = "warningCountGroup")
+    List<Map<String, String>> warningCountGroup(  Map<String, String> parameterMap );
 
     @SelectProvider(type = ProviderClass.class, method = "selectMapGroupJb")
     List<Map<String, Integer>> selectMapGroupJb(  Map<String, String> parameterMap );
@@ -187,6 +193,39 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
             return sql.toString();
         }
 
+
+        public String warningCountGroup(   Map<String, String>  parameterMap){
+            StringBuilder sql = new StringBuilder();
+
+            sql.append(" SELECT count(*) from sms_check_customer_info_become_due  due where 1=1  ");
+
+            if (StringUtils.isNotBlank(parameterMap.get("startDate"))){
+                sql.append(" and  due.create_time>='"+parameterMap.get("startDate")+"'  ");
+            }
+            if (StringUtils.isNotBlank(parameterMap.get("endDate")))  {
+                sql.append(" and  due.create_time<='"+parameterMap.get("endDate")+"'  ");
+            }
+            if (StringUtils.isNotBlank(parameterMap.get("taskType")))  {
+                sql.append(" and  due.type ="+parameterMap.get("taskType")+"  ");
+            }
+            sql.append(" union all  ");
+
+
+            sql.append(" SELECT count(*) from sms_warning_check_customer_data_history  his  LEFT JOIN sms_check_customer_info_become_due due  on due.id = his.due_id where 1=1  ");
+
+            if (StringUtils.isNotBlank(parameterMap.get("startDate"))){
+                sql.append(" and  his.create_time>='"+parameterMap.get("startDate")+"'  ");
+            }
+            if (StringUtils.isNotBlank(parameterMap.get("endDate")))  {
+                sql.append(" and  his.create_time<='"+parameterMap.get("endDate")+"'  ");
+            }
+            if (StringUtils.isNotBlank(parameterMap.get("taskType")))  {
+                sql.append(" and  due.type ="+parameterMap.get("taskType")+"  ");
+            }
+
+
+            return sql.toString();
+        }
         public String getWarningFiled(   Map<String, String>  parameterMap){
             StringBuilder sql = new StringBuilder();
             sql.append("    SELECT count(*),'行短码号证书是否到期' from sms_check_customer_info_become_due due \n" +
@@ -603,6 +642,38 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
         }
 
 
+
+        public String groupCheckStateWarning(String startDate, String endDate, String taskId,String taskType) {
+            StringBuilder sql = new StringBuilder();
+
+            sql.append("   SELECT\n" +
+                    "\tCOUNT(*) AS count,\n" +
+                    "\tcheck_state AS checkState \n" +
+                    "FROM\n" +
+                    "\tsms_check_customer_info_become_due\n" +
+                    "\tLEFT JOIN sms_check_task ON sms_check_task.id = sms_check_customer_info_become_due.task_id \n" +
+                    "WHERE\n" +
+                    "\tsms_check_customer_info_become_due.del_flag = 0  ");
+
+            if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)){
+                sql.append(" and   sms_check_customer_info_become_due.create_time >= '" + startDate + "'");
+                sql.append(" and sms_check_customer_info_become_due.create_time <= '" + endDate + "'");
+
+            }
+            if (StringUtils.isNotBlank(taskType)){
+                sql.append(" and  sms_check_customer_info_become_due.type = " + taskType + "");
+            }
+
+            if (StringUtils.isNotBlank(taskId)){
+                sql.append(" and task_id = '" + taskId + "'");
+            }
+
+            sql.append(" GROUP BY check_state ");
+
+            return sql.toString();
+        }
+
+
         public String checkInfoWarningCount(SmsCheckCustomerInfo smsCheckCustomerInfo) {
             StringBuilder sql = new StringBuilder();
             sql.append("SELECT COUNT(1) " +

tnc-sms/src/main/java/org/jeecg/modules/smscheck/mapper/SmsWarningCheckCustomerDataHistoryMapper.java

@@ -0,0 +1,10 @@
+package org.jeecg.modules.smscheck.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.jeecg.modules.smscheck.entity.SmsWarningCheckCustomerDataHistory;
+import org.jeecg.modules.smscheck.entity.SmsWarningCheckCustomerDataLog;
+
+@Mapper
+public interface SmsWarningCheckCustomerDataHistoryMapper extends BaseMapper<SmsWarningCheckCustomerDataHistory> {
+}

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/ISmsCheckCustomerInfoService.java

@@ -34,6 +34,9 @@ public interface ISmsCheckCustomerInfoService extends IService<SmsCheckCustomerI
 
     List<SmsCustomerInfoGroupByCheckState> groupCheckState(String startDate, String endDate,String taskId,String taskType);
 
+
+    List<SmsCustomerInfoGroupByCheckState> groupCheckStateWarning(String startDate, String endDate,String taskId,String taskType);
+
     List<SysDepartModel> getSysDepartModel();
 
 
@@ -53,6 +56,8 @@ public interface ISmsCheckCustomerInfoService extends IService<SmsCheckCustomerI
 
     Map<Object,Object>  getWarningCount(  Map<String, String>  parameterMap);
 
+    Map<String, Integer>  warningCountGroup(  Map<String, String>  parameterMap);
+
     Map<Object,Object>  getWarningCountOrg(  Map<String, String>  parameterMap);
 
     List<Map<String, Integer>>  selectMapGroup(  Map<String, String>  parameterMap);

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/SmsWarningCheckCustomerDataHistoryService.java

@@ -0,0 +1,10 @@
+package org.jeecg.modules.smscheck.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.smscheck.entity.SmsWarningCheckCustomerDataHistory;
+import org.jeecg.modules.smscheck.entity.SmsWarningCheckCustomerDataLog;
+import org.jeecg.modules.smscheck.vo.SmsWarningCheckCustomerDataLogVo;
+
+public interface SmsWarningCheckCustomerDataHistoryService extends IService<SmsWarningCheckCustomerDataHistory> {
+
+}

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/impl/SmsCheckCustomerInfoServiceImpl.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.smscheck.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.models.auth.In;
 import org.checkerframework.checker.units.qual.A;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.vo.SysDepartModel;
@@ -64,6 +65,11 @@ public class SmsCheckCustomerInfoServiceImpl extends ServiceImpl<SmsCheckCustome
         return smsCheckCustomerInfoMapper.groupCheckState( startDate,  endDate,id,taskType);
     }
 
+    @Override
+    public List<SmsCustomerInfoGroupByCheckState> groupCheckStateWarning(String startDate, String endDate,String id,String taskType) {
+        return smsCheckCustomerInfoMapper.groupCheckStateWarning( startDate,  endDate,id,taskType);
+    }
+
     @Override
     public List<SysDepartModel> getSysDepartModel() {
         return smsCheckCustomerInfoMapper.selectSysDepartModel();
@@ -275,6 +281,19 @@ public class SmsCheckCustomerInfoServiceImpl extends ServiceImpl<SmsCheckCustome
     }
 
     @Override
+    public Map<String, Integer> warningCountGroup(Map<String, String> parameterMap) {
+
+        Map<String, Integer> map =new HashMap<>();
+
+        List<Map<String, String>> maps = smsCheckCustomerInfoMapper.warningCountGroup(parameterMap);
+
+        map.put("his",Integer.parseInt(String.valueOf(maps.get(1).get("count(*)"))));
+        map.put("sum",Integer.parseInt(String.valueOf(maps.get(0).get("count(*)")))-Integer.parseInt(String.valueOf((maps.get(1).get("count(*)")))));
+
+        return map;
+    }
+
+        @Override
     public Map<Object, Object> getWarningCount(Map<String, String> parameterMap) {
         List<Map<String, Integer>> maps = smsCheckCustomerInfoMapper.getWarningFiled( parameterMap);
 

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/impl/SmsWarningCheckCustomerDataHistoryServiceImpl.java

@@ -0,0 +1,26 @@
+package org.jeecg.modules.smscheck.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.common.util.BeanCopyUtil;
+import org.jeecg.modules.smscheck.configs.CheckStateCode;
+import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfoBecomeDue;
+import org.jeecg.modules.smscheck.entity.SmsWarningCheckCustomerDataHistory;
+import org.jeecg.modules.smscheck.entity.SmsWarningCheckCustomerDataLog;
+import org.jeecg.modules.smscheck.mapper.SmsWarningCheckCustomerDataHistoryMapper;
+import org.jeecg.modules.smscheck.mapper.SmsWarningCheckCustomerDataLogMapper;
+import org.jeecg.modules.smscheck.service.SmsCheckCustomerInfoBecomeDueService;
+import org.jeecg.modules.smscheck.service.SmsWarningCheckCustomerDataHistoryService;
+import org.jeecg.modules.smscheck.service.SmsWarningCheckCustomerDataLogService;
+import org.jeecg.modules.smscheck.vo.SmsWarningCheckCustomerDataLogVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.lang.reflect.Field;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicReference;
+
+@Service
+public class SmsWarningCheckCustomerDataHistoryServiceImpl extends ServiceImpl<SmsWarningCheckCustomerDataHistoryMapper, SmsWarningCheckCustomerDataHistory> implements SmsWarningCheckCustomerDataHistoryService {
+
+}