Merge remote-tracking branch 'origin/master'

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

@@ -808,7 +808,6 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
                     queryWrapper.eq(SmsCheckCustomerData::getInfoId, byId.getInfoId());
                     SmsCheckCustomerData smsCheckCustomerData = customerDataService.getOne(queryWrapper);
 
-
                     UpdateWrapper<SmsCheckCustomerData> updateWrapper = new UpdateWrapper<>();
                     updateWrapper.in("id",  smsCheckCustomerData.getId());
                     if (byId.getShortNowContractDateIs()!=0){

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

@@ -76,6 +76,8 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
     private DataYearMonthImpl dataYearMonth;
     @Autowired
     private ISmsCheckCustomerInfoErrorService smsCheckCustomerInfoErrorService;
+    @Autowired
+    ISmsCheckCustomerInfoService iSmsCheckCustomerInfoService;
     private static int i=0;
     /**
      * 分页列表查询
@@ -156,7 +158,14 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
     @ApiOperation(value = "稽核任务-通过id删除", notes = "稽核任务-通过id删除")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id") String id) {
-        taskService.removeById(id);
+        boolean removeById = taskService.removeById(id);
+        if (removeById){
+            LambdaQueryWrapper<SmsCheckCustomerInfo> smsCheckCustomerInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            smsCheckCustomerInfoLambdaQueryWrapper.eq(SmsCheckCustomerInfo::getTaskId,id);
+            SmsCheckCustomerInfo smsCheckCustomerInfo = new SmsCheckCustomerInfo();
+            smsCheckCustomerInfo.setDelFlag(1);
+            iSmsCheckCustomerInfoService.update(smsCheckCustomerInfo,smsCheckCustomerInfoLambdaQueryWrapper);
+        }
         return Result.OK("删除成功!");
     }
 
@@ -170,7 +179,18 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
     @ApiOperation(value = "稽核任务-批量删除", notes = "稽核任务-批量删除")
     @DeleteMapping(value = "/deleteBatch")
     public Result<String> deleteBatch(@RequestParam(name = "ids") String ids) {
-        this.taskService.removeByIds(Arrays.asList(ids.split(",")));
+        boolean remove = this.taskService.removeByIds(Arrays.asList(ids.split(",")));
+        if (remove){
+            List<String> taskIds = Arrays.asList(ids.split(","));
+            for (String taskId:taskIds){
+                LambdaQueryWrapper<SmsCheckCustomerInfo> smsCheckCustomerInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                smsCheckCustomerInfoLambdaQueryWrapper.eq(SmsCheckCustomerInfo::getTaskId,taskId);
+                SmsCheckCustomerInfo smsCheckCustomerInfo = new SmsCheckCustomerInfo();
+                smsCheckCustomerInfo.setDelFlag(1);
+                iSmsCheckCustomerInfoService.update(smsCheckCustomerInfo,smsCheckCustomerInfoLambdaQueryWrapper);
+            }
+
+        }
         return Result.OK("批量删除成功!");
     }
 

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

@@ -6,8 +6,10 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.smscheck.entity.SmsLotCustomerData;
 import org.jeecg.modules.smscheck.entity.SmsWarningCheckCustomerDataLog;
 import org.jeecg.modules.smscheck.entity.SmsWarningCustomerData;
+import org.jeecg.modules.smscheck.service.SmsLotCustomerService;
 import org.jeecg.modules.smscheck.service.SmsWarningCheckCustomerDataLogService;
 import org.jeecg.modules.smscheck.service.SmsWarningCustomerDataService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +24,8 @@ public class SmsWarningCustomerController {
     SmsWarningCustomerDataService smsWarningCustomerDataService;
     @Autowired
     SmsWarningCheckCustomerDataLogService smsWarningCheckCustomerDataLogService;
+    @Autowired
+    SmsLotCustomerService smsLotCustomerService;
 
     @ApiOperation(value = "稽核预警-物联网提交", notes = "稽核预警-物联网提交")
     @PostMapping(value = "/lot/edit/data")
@@ -84,6 +88,18 @@ public class SmsWarningCustomerController {
         if (!audit){
             return Result.error("稽核失败，请检查资料信息");
         }
+        LambdaQueryWrapper<SmsWarningCustomerData> dataLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        dataLambdaQueryWrapper.eq(SmsWarningCustomerData::getDueId,dueId);
+        SmsWarningCustomerData data = smsWarningCustomerDataService.getOne(dataLambdaQueryWrapper);
+        String lotContract = data.getLotContract();
+        if (StringUtils.isNotBlank(lotContract)){
+            LambdaQueryWrapper<SmsLotCustomerData> smsLotCustomerDataLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            smsLotCustomerDataLambdaQueryWrapper.eq(SmsLotCustomerData::getInfoId,infoId);
+            SmsLotCustomerData lotCustomerData = new SmsLotCustomerData();
+            lotCustomerData.setContract(lotCustomerData.getContract()+","+lotContract);
+            smsLotCustomerService.update(lotCustomerData,smsLotCustomerDataLambdaQueryWrapper);
+        }
+
         return Result.ok("稽核成功");
     }