Merge remote-tracking branch 'origin/master'

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

@@ -273,16 +273,30 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     @ApiOperation(value = "客户信息-通过id删除", notes = "客户信息-通过id删除")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id") String id) {
-        customerInfoService.removeById(id);
-        return Result.OK("删除成功!");
+        SmsCheckCustomerInfo byId = customerInfoService.getById(id);
+        if (byId != null){
+            Integer checkState = byId.getCheckState();
+            if (checkState == 0 || checkState == 1 || checkState == 4){
+                customerInfoService.removeById(id);
+                return Result.OK("删除成功!");
+            }
+        }
+        return Result.error("删除失败!");
     }
+
     @AutoLog(value = "客户信息-通过id删除")
     @ApiOperation(value = "客户信息-通过id删除", notes = "客户信息-通过id删除")
     @DeleteMapping(value = "/deleteByIds")
     public Result<String> deleteByIds(@RequestParam(name = "ids") String id) {
         String[] split = id.split(",");
         for (String s : split) {
-            customerInfoService.removeById(s);
+            SmsCheckCustomerInfo byId = customerInfoService.getById(s);
+            if (byId != null){
+                Integer checkState = byId.getCheckState();
+                if (checkState == 0 || checkState == 1 || checkState == 4){
+                    customerInfoService.removeById(s);
+                }
+            }
         }
         return Result.OK("删除成功!");
     }

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

@@ -0,0 +1,53 @@
+package org.jeecg.modules.smscheck.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@ApiModel(value="sms_check_customer_info_become_due", description="稽核资料到期数据表")
+@TableName("sms_check_customer_info_become_due")
+public class SmsCheckCustomerInfoBecomeDue implements Serializable {
+    /** 主键 */
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+    /** 任务ID */
+    private String taskId;
+    /** 关联稽核信息ID */
+    private String infoId;
+    /** 稽核状态（0：未处理；1：未完善；2：待稽核；4：待整改；5：稽核通过；） */
+    private int checkState;
+    /** 客户信息所属类型：1:行短稽核 2：物联网业务稽核 3.复开审批 4.中继线稽核 */
+    private int type;
+    /** 行短码号证书是否到期 */
+    private int shortNowCodeNumberDateIs;
+    /** 行短备案通知是否到期 */
+    private int shortNowFilingsDataIs;
+    /** 行短增值业务许可证是否到期 */
+    private int shortNowPermitDateIs;
+    /** 行短合同是否到期 */
+    private int shortNowContractDateIs;
+    /** 物联网合同是否到期 */
+    private int lotContractDateIs;
+    /** 中继线业务合同是否到期 */
+    private int truckContractDateIs;
+    /** 中继线房屋租凭合同是否到期 */
+    private int truckHouseDateIs;
+    /** 中继线增值业务许可证是否到期 */
+    private int truckAddedLicenseDateIs;
+    /** 删除标识 */
+    private Integer delFlag;
+    /** 创建人 */
+    private String createBy;
+    /** 创建时间 */
+    private Date createTime;
+    /** 更新人 */
+    private String updateBy;
+    /** 更新时间 */
+    private Date updateTime;
+}

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

@@ -1,8 +1,11 @@
 package org.jeecg.modules.smscheck.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerData;
 
+import java.util.List;
+
 /**
  * @description 客户资料
  * @author jeecg-boot
@@ -11,4 +14,35 @@ import org.jeecg.modules.smscheck.entity.SmsCheckCustomerData;
  */
 public interface SmsCheckCustomerDataMapper extends BaseMapper<SmsCheckCustomerData> {
 
+    /**
+     * 码号证到期时间
+     * @param days 天数
+     * @return
+     */
+    @Select("SELECT * FROM sms_check_customer_data WHERE code_number_date_date >= DATE_SUB(CURDATE(),INTERVAL #{days} DAY)")
+    List<SmsCheckCustomerData> listByCodeNumberDateDate(Integer days);
+
+    /**
+     * 备案通知到期时间
+     * @param days
+     * @return
+     */
+    @Select("SELECT * FROM sms_check_customer_data WHERE filings_date_date >= DATE_SUB(CURDATE(),INTERVAL #{days} DAY)")
+    List<SmsCheckCustomerData> listByFilingsDateDate(Integer days);
+
+    /**
+     * 增值业务许可证到期时间
+     * @param days
+     * @return
+     */
+    @Select("SELECT * FROM sms_check_customer_data WHERE permit_date_date >= DATE_SUB(CURDATE(),INTERVAL #{days} DAY)")
+    List<SmsCheckCustomerData> listByPermitDateDate(Integer days);
+
+    /**
+     * 合同到期时间
+     * @param days
+     * @return
+     */
+    @Select("SELECT * FROM sms_check_customer_data WHERE contract_date_date >= DATE_SUB(CURDATE(),INTERVAL #{days} DAY)")
+    List<SmsCheckCustomerData> listByContractDateData(Integer days);
 }

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

@@ -0,0 +1,9 @@
+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.SmsCheckCustomerInfoBecomeDue;
+
+@Mapper
+public interface SmsCheckCustomerInfoBecomeDueMapper extends BaseMapper<SmsCheckCustomerInfoBecomeDue> {
+}

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

@@ -2,8 +2,14 @@ package org.jeecg.modules.smscheck.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.smscheck.entity.SmsLotCustomerData;
 
+import java.util.List;
+
 @Mapper
 public interface SmsLotCustomerMapper  extends BaseMapper<SmsLotCustomerData> {
+    @Select("SELECT * FROM sms_lot_customer_data " +
+            "WHERE contract_date >= DATE_SUB(CURDATE(),INTERVAL #{days} DAY)")
+    List<SmsLotCustomerData> listByContractDateData(Integer days);
 }

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

@@ -1,13 +1,26 @@
 package org.jeecg.modules.smscheck.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.smscheck.entity.SmsTruckCustomerData;
 
+import java.util.List;
+
 
 /**
  * 中继线稽核数据文件
  */
 @Mapper
 public interface SmsTruckCustomerDataMapper  extends BaseMapper<SmsTruckCustomerData> {
+    @Select("SELECT * FROM sms_truck_customer_data " +
+            "WHERE contract_date >= DATE_SUB(CURDATE(),INTERVAL #{days} DAY)")
+    List<SmsTruckCustomerData> listByContractDateData(Integer days);
+
+    @Select("SELECT * FROM sms_truck_customer_data " +
+            "WHERE house_date >= DATE_SUB(CURDATE(),INTERVAL #{days} DAY)")
+    List<SmsTruckCustomerData> listByHouseDate(Integer days);
 
+    @Select("SELECT * FROM sms_truck_customer_data " +
+            "WHERE added_license >= DATE_SUB(CURDATE(),INTERVAL #{days} DAY)")
+    List<SmsTruckCustomerData> listByAddedLicense(Integer days);
 }

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

@@ -0,0 +1,10 @@
+package org.jeecg.modules.smscheck.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfoBecomeDue;
+
+/**
+ * 稽核资料到期数据业务
+ */
+public interface SmsCheckCustomerInfoBecomeDueService extends IService<SmsCheckCustomerInfoBecomeDue> {
+}

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.smscheck.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfoBecomeDue;
+import org.jeecg.modules.smscheck.mapper.SmsCheckCustomerInfoBecomeDueMapper;
+import org.jeecg.modules.smscheck.service.SmsCheckCustomerInfoBecomeDueService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 稽核资料到期数据业务
+ */
+@Service
+public class SmsCheckCustomerInfoBecomeDueServiceImpl  extends ServiceImpl<SmsCheckCustomerInfoBecomeDueMapper, SmsCheckCustomerInfoBecomeDue> implements SmsCheckCustomerInfoBecomeDueService {
+}