Merge remote-tracking branch 'origin/master'

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

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

@@ -815,7 +815,8 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
                         smsCheckCustomerData.setContractDateDate(warningCheckCustomerDataLog.getContractDateDate());
                         smsCheckCustomerData.setContractDateDateIs(warningCheckCustomerDataLog.getContractDateDateIs());
                         updateWrapper.set("contract_date_date", warningCheckCustomerDataLog.getContractDateDate())
-                                .set("contract_date_date_is", warningCheckCustomerDataLog.getContractDateDateIs());
+                                .set("contract_date_date_is", warningCheckCustomerDataLog.getContractDateDateIs())
+                                .set("contract_date", warningCheckCustomerDataLog.getContractDate());
                     }
                     if (byId.getShortNowCodeNumberDateIs()!=0){
 

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

@@ -110,6 +110,9 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     @Value("${special.email.audit.account}")
     private String emailAccount;
 
+    @Autowired
+    private ISysUserService sysUserService;
+
     @Autowired
     private SmsCheckCustomerInfoBecomeDueService dueService;
 
@@ -1348,15 +1351,22 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     @ApiOperation(value = "通知客户经理", notes = "通知客户经理")
     @PostMapping(value = "/notice")
     public Result<String> notice(@RequestBody SmsCheckCustomerInfo info) {
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String staffNo = info.getStaffNo();
+        if (StringUtils.isEmpty(staffNo)){
+            return Result.error("用户邮箱获取失败");
+        }
+        LambdaQueryWrapper<SysUser> userLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        userLambdaQueryWrapper.eq(SysUser::getUsername,staffNo);
+        SysUser sysUser = sysUserService.getOne(userLambdaQueryWrapper);
+        if (sysUser == null){
+            return Result.error("用户邮箱获取失败");
+        }
+
         String workNo = info.getStaffNo();
         LoginUser toUser = sysBaseAPI.getUserByWorkNo(workNo);
         MessageDTO message = new MessageDTO();
-
         String taskId = info.getTaskId();
-
         SmsCheckTask byId = taskService.getById(taskId);
-
         String type ="";
         String typeName ="";
         //1:行短稽核 2：物联网业务稽核 3.复开审批 4.中继线稽核
@@ -1384,7 +1394,6 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         sysBaseAPI.sendSysAnnouncement(message);
         // 发送邮件
         EmailSendMsgHandle emailSendMsgHandle = new EmailSendMsgHandle();
-        //liutt3.bj@chinatelecom.cn sysUser.getEmail()  1335445690@qq.com"
         emailSendMsgHandle.SendMsg(sysUser.getEmail(),
                 typeName+"稽核待办，用户编号：【" + info.getUserNo() + "】", type+ "  ，客户编号：【" + info.getCustomerNo()
                         + "】，用户编号：【" + info.getUserNo() + "】的客户资料请尽快完善。");

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

@@ -3,8 +3,13 @@ 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 com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -12,6 +17,8 @@ import java.util.Date;
 @Data
 @ApiModel(value="sms_check_customer_info_become_due", description="稽核资料到期数据表")
 @TableName("sms_check_customer_info_become_due")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
 public class SmsCheckCustomerInfoBecomeDue implements Serializable {
     /** 主键 */
     @TableId(type = IdType.ASSIGN_ID)
@@ -42,17 +49,27 @@ public class SmsCheckCustomerInfoBecomeDue implements Serializable {
     private Integer truckAddedLicenseDateIs;
     /** 删除标识 */
     private Integer delFlag;
+
     /** 创建人 */
+    @ApiModelProperty(value = "创建人")
     private String createBy;
-    /** 创建时间 */
+    /** 创建日期 */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
     private Date createTime;
     /** 更新人 */
+    @ApiModelProperty(value = "更新人")
     private String updateBy;
-    /** 更新时间 */
+    /** 更新日期 */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
     private Date updateTime;
-    /**  */
-    private String staff_no;
-    /** 机构 */
-    private String sys_org_code;
+    /** 所属部门 */
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+    /**员工变红*/
+    private String staffNo;
 
 }

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

@@ -1,10 +1,12 @@
 package org.jeecg.modules.smscheck.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerData;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @description 客户资料
@@ -19,30 +21,46 @@ public interface SmsCheckCustomerDataMapper extends BaseMapper<SmsCheckCustomerD
      * @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);
+    @Select("SELECT * " +
+            "FROM sms_check_customer_data " +
+            "WHERE DATE_ADD(CURDATE(), INTERVAL #{days} DAY) >= code_number_date_date " +
+            "AND DATE_SUB(CURDATE(), INTERVAL #{days} DAY) <= code_number_date_date")
+    @MapKey("infoId")
+    Map<String,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);
+    @Select("SELECT * " +
+            "FROM sms_check_customer_data " +
+            "WHERE DATE_ADD(CURDATE(), INTERVAL #{days} DAY) >= filings_date_date " +
+            "AND DATE_SUB(CURDATE(), INTERVAL #{days} DAY) <= filings_date_date")
+    @MapKey("infoId")
+    Map<String,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);
+    @Select("SELECT * " +
+            "FROM sms_check_customer_data " +
+            "WHERE DATE_ADD(CURDATE(), INTERVAL #{days} DAY) >= permit_date_date " +
+            "AND DATE_SUB(CURDATE(), INTERVAL #{days} DAY) <= permit_date_date")
+    @MapKey("infoId")
+    Map<String,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);
+    @Select("SELECT * " +
+            "FROM sms_check_customer_data " +
+            "WHERE DATE_ADD(CURDATE(), INTERVAL #{days} DAY) >= contract_date_date " +
+            "AND DATE_SUB(CURDATE(), INTERVAL #{days} DAY) <= contract_date_date")
+    @MapKey("infoId")
+    Map<String,SmsCheckCustomerData> listByContractDateData(Integer days);
 }

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

@@ -6,7 +6,6 @@ import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.apache.ibatis.annotations.UpdateProvider;
 import org.jeecg.common.system.vo.SysDepartModel;
-import org.jeecg.common.system.vo.SysPermissionDataRuleModel;
 import org.jeecg.modules.smscheck.entity.*;
 import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoTaskVo;
 import org.jeecg.modules.smscheck.vo.SmsCheckTaskVo;
@@ -50,12 +49,11 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
     List<SmsCustomerInfoGroupByCheckState> groupCheckState(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 );
+    List<SmsCheckCustomerInfoBecomeDueAndInfo> selectListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo);
 
     class ProviderClass {
 
-        public String selectListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo,SysPermissionDataRuleModel sysPermissionDataRuleModel,  SysUser sysUser ){
-
+        public String selectListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo){
 
             StringBuilder sql = new StringBuilder();
 
@@ -122,7 +120,9 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
                     "sms_check_customer_info.`account_code`,\n" +
                     "sms_check_customer_info.`floor_name`,\n" +
                     "sms_check_customer_info.`floor_code`,\n" +
-                    "sms_check_customer_info.`notes`   from sms_check_customer_info_become_due   \n" +
+                    "sms_check_customer_info_become_due.`create_time`,\n" +
+                    "sms_check_customer_info.`notes`   " +
+                    "from sms_check_customer_info_become_due   \n" +
                     "LEFT JOIN sms_check_customer_info   on sms_check_customer_info_become_due.info_id = sms_check_customer_info.id \n" +
                     " where 1=1 and  sms_check_customer_info_become_due.del_flag=0    ");
             if (StringUtils.isNotBlank(smsCheckCustomerInfo.getCustomerNo())){

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

@@ -1,15 +1,20 @@
 package org.jeecg.modules.smscheck.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.smscheck.entity.SmsLotCustomerData;
 
 import java.util.List;
+import java.util.Map;
 
 @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);
+    @Select("SELECT * " +
+            "FROM sms_lot_customer_data " +
+            "WHERE DATE_ADD(CURDATE(), INTERVAL #{days} DAY) >= contract_date " +
+            "AND DATE_SUB(CURDATE(), INTERVAL #{days} DAY) <= contract_date")
+    @MapKey("infoId")
+    Map<String,SmsLotCustomerData> listByContractDateData(Integer days);
 }

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

@@ -1,10 +1,11 @@
 package org.jeecg.modules.smscheck.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.smscheck.entity.SmsTruckCustomerData;
 
-import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -12,15 +13,24 @@ 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 DATE_ADD(CURDATE(), INTERVAL #{days} DAY) >= contract_date " +
+            "AND DATE_SUB(CURDATE(), INTERVAL #{days} DAY) <= contract_date")
+    @MapKey("infoId")
+    Map<String,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 DATE_ADD(CURDATE(), INTERVAL #{days} DAY) >= house_date " +
+            "AND DATE_SUB(CURDATE(), INTERVAL #{days} DAY) <= house_date")
+    @MapKey("infoId")
+    Map<String,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);
+    @Select("SELECT * " +
+            "FROM sms_truck_customer_data " +
+            "WHERE DATE_ADD(CURDATE(), INTERVAL #{days} DAY) >= added_license " +
+            "AND DATE_SUB(CURDATE(), INTERVAL #{days} DAY) <= added_license")
+    @MapKey("infoId")
+    Map<String,SmsTruckCustomerData> listByAddedLicense(Integer days);
 }