sunyize 2 anni fa
parent
commit
e63cff32a1

+ 24 - 0
tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/BusinessReminderCardController.java

@@ -806,6 +806,7 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         businessReminderCardLog.setUpdateBy(sysUser.getUsername());
         businessReminderCardLog.setDelFlag(0);
         businessReminderCardLog.setUserId(sysUser.getId());
+        businessReminderCardLog.setOperateType("修改");
         businessReminderCardLogService.save(businessReminderCardLog);
 
         if (updateById) {
@@ -1142,6 +1143,17 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         String sql = QueryGenerator.installAuthJdbc(BusinessReminderCard.class);
         updateWrapper.in("id", list).set("status", 2).set("up_time",new Date());
         boolean update = businessReminderCardService.update(updateWrapper);
+        for (String s : list) {
+            BusinessReminderCardLog businessReminderCardLog =new BusinessReminderCardLog();
+            businessReminderCardLog.setBusinessReminderCardId(s);
+            businessReminderCardLog.setUpdateTime(new Date());
+            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+            businessReminderCardLog.setUpdateBy(sysUser.getUsername());
+            businessReminderCardLog.setDelFlag(0);
+            businessReminderCardLog.setUserId(sysUser.getId());
+            businessReminderCardLog.setOperateType("上报省公司");
+            businessReminderCardLogService.save(businessReminderCardLog);
+        }
         if (update) {
             return Result.ok("上报成功");
         }
@@ -1163,6 +1175,18 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         String sql = QueryGenerator.installAuthJdbc(BusinessReminderCard.class);
         updateWrapper.in("id", list).set("status", 1);
         boolean update = businessReminderCardService.update(updateWrapper);
+        for (String s : list) {
+            BusinessReminderCardLog businessReminderCardLog =new BusinessReminderCardLog();
+            businessReminderCardLog.setBusinessReminderCardId(s);
+            businessReminderCardLog.setUpdateTime(new Date());
+            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+            businessReminderCardLog.setUpdateBy(sysUser.getUsername());
+            businessReminderCardLog.setDelFlag(0);
+            businessReminderCardLog.setUserId(sysUser.getId());
+            businessReminderCardLog.setOperateType("上报分公司");
+            businessReminderCardLogService.save(businessReminderCardLog);
+        }
+
         if (update) {
             return Result.ok("上报成功");
         }

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

@@ -1384,6 +1384,24 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         return Result.ok(page);
     }
 
+    /**
+     * 查询反诈客户公司
+     * @param businessReminderCard
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/selectCustomerList")
+    public Result<IPage<BusinessReminderCardVo>> selectCustomerList(BusinessReminderCard businessReminderCard,
+                                                                 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+        List<BusinessReminderCardVo> businessReminderCardList = customerInfoService.selectCustomerList(businessReminderCard);
+        Page<BusinessReminderCardVo> page = new Page<>();
+        page.setRecords(businessReminderCardList);
+        return Result.ok(page);
+    }
+
+
     /**
      * 获取稽核任务
      *

+ 1 - 0
tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/BusinessReminderCardLog.java

@@ -34,6 +34,7 @@ public class BusinessReminderCardLog {
 
     private String updateBy;
 
+    private String operateType;
 
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

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

@@ -6,6 +6,8 @@ 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.modules.smscheck.entity.BusinessReminderCard;
+import org.jeecg.modules.smscheck.entity.BusinessReminderCardVo;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
 import org.jeecg.modules.smscheck.entity.SmsCustomerInfoGroupByCheckState;
 import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoTaskVo;
@@ -24,6 +26,9 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
     @SelectProvider(type = ProviderClass.class, method = "selectCompanyList")
     List<SmsCheckCustomerInfo> selectCompanyList(SmsCheckCustomerInfo smsCheckCustomerInfo);
 
+    @SelectProvider(type = ProviderClass.class, method = "selectCustomerList")
+    List<BusinessReminderCardVo> selectCustomerList(BusinessReminderCard businessReminderCard);
+
     @SelectProvider(type = ProviderClass.class, method = "selectSysDepartModel")
     List<SysDepartModel> selectSysDepartModel();
 
@@ -48,6 +53,8 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
 
     class ProviderClass {
 
+
+
         public String selectSysDepartModel(){
 
             StringBuilder sql = new StringBuilder();
@@ -149,7 +156,28 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
             return sql.toString();
 
         }
-
+        public String selectCustomerList(BusinessReminderCard businessReminderCard){
+            StringBuilder sql = new StringBuilder();
+            sql.append("SELECT t1.* FROM as_business_reminder_card t1 INNER JOIN \n" +
+                    "(SELECT MIN(id) AS min_id FROM as_business_reminder_card GROUP BY card_no)t2 ON \n" +
+                    "t1.id=t2.min_id ");
+            String cardNo = businessReminderCard.getCardNo();
+            String cardName = businessReminderCard.getCardName();
+            if (!StringUtils.isEmpty(cardNo)) {
+                String customerNoNow = cardNo.replace("*", "%");
+                sql.append(" WHERE `card_no` like '" + customerNoNow + "'");
+                if (!StringUtils.isEmpty(cardName)) {
+                    String customerNameNow = cardName.replace("*", "%");
+                    sql.append(" AND `card_name` like '" + customerNameNow + "'");
+                }
+            } else {
+                if (!StringUtils.isEmpty(cardName)) {
+                    String customerNameNow = cardName.replace("*", "%");
+                    sql.append(" WHERE `card_name` like '" + customerNameNow + "'");
+                }
+            }
+            return sql.toString();
+        }
         public String selectCompanyList(SmsCheckCustomerInfo smsCheckCustomerInfo) {
             StringBuilder sql = new StringBuilder();
             sql.append("SELECT any_value(id) id, any_value(customer_no) customer_no,`customer_name`,any_value(account_manager) account_manager,any_value(account_manager_phone) account_manager_phone,any_value(network_access_time) network_access_time  FROM `sms_check_customer_info`");

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

@@ -2,6 +2,8 @@ package org.jeecg.modules.smscheck.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.system.vo.SysDepartModel;
+import org.jeecg.modules.smscheck.entity.BusinessReminderCard;
+import org.jeecg.modules.smscheck.entity.BusinessReminderCardVo;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
 import org.jeecg.modules.smscheck.entity.SmsCustomerInfoGroupByCheckState;
 import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoTaskVo;
@@ -19,6 +21,8 @@ public interface ISmsCheckCustomerInfoService extends IService<SmsCheckCustomerI
 
     List<SmsCheckCustomerInfo> selectCompanyList(SmsCheckCustomerInfo smsCheckCustomerInfo);
 
+    List<BusinessReminderCardVo> selectCustomerList(BusinessReminderCard businessReminderCard);
+
     Integer checkInfoWarningCount(SmsCheckCustomerInfo smsCheckCustomerInfo);
 
     List<SmsCheckTaskVo> checkInfoWarningCountTime(SmsCheckCustomerInfo smsCheckCustomerInfo);

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

@@ -1,6 +1,8 @@
 package org.jeecg.modules.smscheck.service.impl;
 
 import org.jeecg.common.system.vo.SysDepartModel;
+import org.jeecg.modules.smscheck.entity.BusinessReminderCard;
+import org.jeecg.modules.smscheck.entity.BusinessReminderCardVo;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
 import org.jeecg.modules.smscheck.entity.SmsCustomerInfoGroupByCheckState;
 import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoTaskVo;
@@ -61,4 +63,9 @@ public class SmsCheckCustomerInfoServiceImpl extends ServiceImpl<SmsCheckCustome
     public List<SmsCheckCustomerInfo> selectCompanyList(SmsCheckCustomerInfo smsCheckCustomerInfo) {
         return smsCheckCustomerInfoMapper.selectCompanyList(smsCheckCustomerInfo);
     }
+
+    @Override
+    public List<BusinessReminderCardVo> selectCustomerList(BusinessReminderCard businessReminderCard){
+        return smsCheckCustomerInfoMapper.selectCustomerList(businessReminderCard);
+    }
 }