|
@@ -27,6 +27,7 @@ import org.jeecg.common.system.query.QueryGenerator;
|
|
|
import org.jeecg.common.system.vo.DictModel;
|
|
import org.jeecg.common.system.vo.DictModel;
|
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
|
import org.jeecg.common.util.MinioUtil;
|
|
import org.jeecg.common.util.MinioUtil;
|
|
|
|
|
+import org.jeecg.common.util.SpringContextUtils;
|
|
|
import org.jeecg.common.util.UUIDGenerator;
|
|
import org.jeecg.common.util.UUIDGenerator;
|
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
|
import org.jeecg.config.shiro.ShiroRealm;
|
|
import org.jeecg.config.shiro.ShiroRealm;
|
|
@@ -37,6 +38,7 @@ import org.jeecg.modules.smscheck.entity.*;
|
|
|
import org.jeecg.modules.smscheck.service.*;
|
|
import org.jeecg.modules.smscheck.service.*;
|
|
|
import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoVo;
|
|
import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoVo;
|
|
|
import org.jeecg.modules.smscheck.vo.SpecialExaminationCustomerVo;
|
|
import org.jeecg.modules.smscheck.vo.SpecialExaminationCustomerVo;
|
|
|
|
|
+import org.jeecg.modules.smscheck.vo.SpecialExaminationVo;
|
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
|
import org.jeecgframework.poi.excel.entity.ImportParams;
|
|
import org.jeecgframework.poi.excel.entity.ImportParams;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -48,6 +50,7 @@ import org.springframework.web.servlet.ModelAndView;
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import java.lang.reflect.Field;
|
|
import java.lang.reflect.Field;
|
|
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
@@ -85,6 +88,7 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private ISysBaseAPI sysBaseApi;
|
|
private ISysBaseAPI sysBaseApi;
|
|
|
|
|
|
|
|
|
|
+
|
|
|
@ApiOperation(value = "客户资料-信息查询查询", notes = "客户资料-个人列表查询")
|
|
@ApiOperation(value = "客户资料-信息查询查询", notes = "客户资料-个人列表查询")
|
|
|
@PostMapping(value = "/find/user/id")
|
|
@PostMapping(value = "/find/user/id")
|
|
|
public Result<?> findUserId(@RequestBody SpecialExamination specialExamination) {
|
|
public Result<?> findUserId(@RequestBody SpecialExamination specialExamination) {
|
|
@@ -183,14 +187,10 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
|
|
|
if (null == customerInfo) {
|
|
if (null == customerInfo) {
|
|
|
return Result.error("客户信息不存在");
|
|
return Result.error("客户信息不存在");
|
|
|
}
|
|
}
|
|
|
- if (CheckStateCode.CHECK_STSTE_5.equals(customerInfo.getCheckState())){
|
|
|
|
|
|
|
+ if (CheckStateCode.CHECK_STSTE_5.equals(customerInfo.getCheckState())) {
|
|
|
return Result.error("该资料已经通过稽核不可再次修改");
|
|
return Result.error("该资料已经通过稽核不可再次修改");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
|
- specialExamination.setCreateUser(sysUser.getUsername());
|
|
|
|
|
- specialExamination.setStaffNo(sysUser.getWorkNo());
|
|
|
|
|
- specialExamination.setStatus(0);
|
|
|
|
|
LambdaQueryWrapper<SpecialExamination> queryWrapperData = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<SpecialExamination> queryWrapperData = new LambdaQueryWrapper<>();
|
|
|
queryWrapperData.eq(SpecialExamination::getInfoId, infoId);
|
|
queryWrapperData.eq(SpecialExamination::getInfoId, infoId);
|
|
|
List<SpecialExamination> list = specialExaminationService.list(queryWrapperData);
|
|
List<SpecialExamination> list = specialExaminationService.list(queryWrapperData);
|
|
@@ -204,15 +204,16 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
|
|
|
//客户信息状态
|
|
//客户信息状态
|
|
|
customerInfo.setCheckState(CheckStateCode.CHECK_STSTE_2);
|
|
customerInfo.setCheckState(CheckStateCode.CHECK_STSTE_2);
|
|
|
//获取关停标签
|
|
//获取关停标签
|
|
|
- String shutdownLabel = ShutdownLabelByCode.msg(specialExamination.getShutdownLabel().toString());
|
|
|
|
|
- customerInfo.setShutdownLabel(shutdownLabel);
|
|
|
|
|
- //获取材料标签=是否特审
|
|
|
|
|
- String materialLabel = specialExamination.getMaterialLabel() == 0 ? "是" : "否";
|
|
|
|
|
- customerInfo.setMaterialLabel(materialLabel);
|
|
|
|
|
|
|
+ //String shutdownLabel = ShutdownLabelByCode.msg(specialExamination.getShutdownLabel().toString());
|
|
|
|
|
+ //customerInfo.setShutdownLabel(shutdownLabel);
|
|
|
|
|
+ customerInfo.setShutdownLabel(specialExamination.getShutdownLabel().toString());
|
|
|
|
|
+ customerInfo.setShutdownLabelDate(specialExamination.getShutdownTime());
|
|
|
infoService.updateById(customerInfo);
|
|
infoService.updateById(customerInfo);
|
|
|
return Result.OK("已成功提交申请");
|
|
return Result.OK("已成功提交申请");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
@AutoLog(value = "特审复开审批-资料批量上传")
|
|
@AutoLog(value = "特审复开审批-资料批量上传")
|
|
|
@ApiOperation(value = "特审复开审批-资料批量上传", notes = "特审复开审批-资料批量上传")
|
|
@ApiOperation(value = "特审复开审批-资料批量上传", notes = "特审复开审批-资料批量上传")
|
|
|
@PostMapping(value = "/batch/edit/info")
|
|
@PostMapping(value = "/batch/edit/info")
|
|
@@ -224,15 +225,12 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
|
|
|
for (String infoId : infoIds) {
|
|
for (String infoId : infoIds) {
|
|
|
//获取客户信息
|
|
//获取客户信息
|
|
|
SmsCheckCustomerInfo customerInfo = infoService.getById(infoId);
|
|
SmsCheckCustomerInfo customerInfo = infoService.getById(infoId);
|
|
|
- if ( CheckStateCode.CHECK_STSTE_5.equals(customerInfo.getCheckState())){
|
|
|
|
|
- //待稽核客户信息不能修改
|
|
|
|
|
|
|
+ if (CheckStateCode.CHECK_STSTE_5.equals(customerInfo.getCheckState()) || CheckStateCode.CHECK_STSTE_4.equals(customerInfo.getCheckState()) || CheckStateCode.CHECK_STSTE_2.equals(customerInfo.getCheckState())) {
|
|
|
|
|
+ //客户信息不能修改
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|
|
|
SpecialExamination specialExamination = new SpecialExamination();
|
|
SpecialExamination specialExamination = new SpecialExamination();
|
|
|
BeanUtil.copyProperties(specialExaminationBatchVo, specialExamination);
|
|
BeanUtil.copyProperties(specialExaminationBatchVo, specialExamination);
|
|
|
- LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
|
- specialExamination.setCreateUser(sysUser.getUsername());
|
|
|
|
|
- specialExamination.setStaffNo(sysUser.getWorkNo());
|
|
|
|
|
specialExamination.setStatus(0);
|
|
specialExamination.setStatus(0);
|
|
|
specialExamination.setInfoId(infoId);
|
|
specialExamination.setInfoId(infoId);
|
|
|
LambdaQueryWrapper<SpecialExamination> queryWrapperData = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<SpecialExamination> queryWrapperData = new LambdaQueryWrapper<>();
|
|
@@ -244,19 +242,17 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
|
|
|
specialExamination.setId(list.get(0).getId());
|
|
specialExamination.setId(list.get(0).getId());
|
|
|
specialExaminationService.updateById(specialExamination);
|
|
specialExaminationService.updateById(specialExamination);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
//客户信息状态
|
|
//客户信息状态
|
|
|
customerInfo.setCheckState(CheckStateCode.CHECK_STSTE_2);
|
|
customerInfo.setCheckState(CheckStateCode.CHECK_STSTE_2);
|
|
|
//修改客户信息列;关停标签/有无特审单
|
|
//修改客户信息列;关停标签/有无特审单
|
|
|
//获取关停标签
|
|
//获取关停标签
|
|
|
- String shutdownLabel = ShutdownLabelByCode.msg(specialExamination.getShutdownLabel().toString());
|
|
|
|
|
- customerInfo.setShutdownLabel(shutdownLabel);
|
|
|
|
|
- //获取材料标签=是否特审
|
|
|
|
|
- String materialLabel = specialExamination.getMaterialLabel() == 0 ? "是" : "否";
|
|
|
|
|
- customerInfo.setMaterialLabel(materialLabel);
|
|
|
|
|
|
|
+ //String shutdownLabel = ShutdownLabelByCode.msg(specialExamination.getShutdownLabel().toString());
|
|
|
|
|
+ //customerInfo.setShutdownLabel(shutdownLabel);
|
|
|
|
|
+ customerInfo.setShutdownLabel(specialExamination.getShutdownLabel().toString());
|
|
|
|
|
+ customerInfo.setShutdownLabelDate(specialExamination.getShutdownTime());
|
|
|
infoService.updateById(customerInfo);
|
|
infoService.updateById(customerInfo);
|
|
|
}
|
|
}
|
|
|
- return Result.OK("已成功提交申请");
|
|
|
|
|
|
|
+ return Result.OK("已成功批量提交申请");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@AutoLog(value = "特审复开审批号-添加")
|
|
@AutoLog(value = "特审复开审批号-添加")
|
|
@@ -270,13 +266,78 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
|
|
|
//用户标签
|
|
//用户标签
|
|
|
Integer userLable = specialExamination.getUserLable();
|
|
Integer userLable = specialExamination.getUserLable();
|
|
|
|
|
|
|
|
-
|
|
|
|
|
if (shutdownLabel == null || materialLabel == null || userLable == null) {
|
|
if (shutdownLabel == null || materialLabel == null || userLable == null) {
|
|
|
return Result.error("参数不全");
|
|
return Result.error("参数不全");
|
|
|
}
|
|
}
|
|
|
specialExaminationService.save(specialExamination);
|
|
specialExaminationService.save(specialExamination);
|
|
|
return Result.OK("添加成功!");
|
|
return Result.OK("添加成功!");
|
|
|
}
|
|
}
|
|
|
|
|
+ @AutoLog(value = "暂存特审复开审批数据")
|
|
|
|
|
+ @ApiOperation(value = "暂存特审复开审批数据", notes = "暂存特审复开审批数据")
|
|
|
|
|
+ @PostMapping(value = "/staging")
|
|
|
|
|
+ public Result<String> staging(@RequestBody SpecialExaminationVo specialExaminationVo) {
|
|
|
|
|
+ String infoId = specialExaminationVo.getInfoId();
|
|
|
|
|
+ if (StrUtil.isBlank(infoId)) {
|
|
|
|
|
+ return Result.error("暂存失败");
|
|
|
|
|
+ }
|
|
|
|
|
+ SpecialExamination specialExamination = new SpecialExamination();
|
|
|
|
|
+ BeanUtil.copyProperties(specialExaminationVo,specialExamination);
|
|
|
|
|
+ // 暂存特审复开数据
|
|
|
|
|
+ SpecialExamination specialByInfoId = specialExaminationService.getSpecialByInfoId(infoId);
|
|
|
|
|
+ if (null == specialByInfoId){
|
|
|
|
|
+ specialExaminationService.save(specialExamination);
|
|
|
|
|
+ }else {
|
|
|
|
|
+ specialExamination.setId(specialByInfoId.getId());
|
|
|
|
|
+ specialExaminationService.updateById(specialExamination);
|
|
|
|
|
+ }
|
|
|
|
|
+ // 修改客户状态
|
|
|
|
|
+ SmsCheckCustomerInfo customerInfo = infoService.getById(infoId);
|
|
|
|
|
+ customerInfo.setCheckState(CheckStateCode.CHECK_STSTE_1);
|
|
|
|
|
+ customerInfo.setShutdownLabel(specialExamination.getShutdownLabel().toString());
|
|
|
|
|
+ customerInfo.setShutdownLabelDate(specialExamination.getShutdownTime());
|
|
|
|
|
+ infoService.updateById(customerInfo);
|
|
|
|
|
+ return Result.ok("暂存完成");
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ @AutoLog(value = "批量暂存特审复开审批数据")
|
|
|
|
|
+ @ApiOperation(value = "批量暂存特审复开审批数据", notes = "批量暂存特审复开审批数据")
|
|
|
|
|
+ @PostMapping(value = "/staging/list")
|
|
|
|
|
+ public Result<String> stagingList(@RequestBody SpecialExaminationVo specialExaminationVo) {
|
|
|
|
|
+ List<String> infoIds = specialExaminationVo.getInfoIds();
|
|
|
|
|
+ if (infoIds == null || infoIds.size() == 0){
|
|
|
|
|
+ return Result.error("客户未选择");
|
|
|
|
|
+ }
|
|
|
|
|
+ infoIds.forEach(infoId -> {
|
|
|
|
|
+ if (StrUtil.isNotBlank(infoId)) {
|
|
|
|
|
+ // 查看当前客户信息
|
|
|
|
|
+ SmsCheckCustomerInfo customerInfo = infoService.getById(infoId);
|
|
|
|
|
+ Integer checkState = customerInfo.getCheckState();
|
|
|
|
|
+ if (CheckStateCode.CHECK_STSTE_0.equals(checkState) || CheckStateCode.CHECK_STSTE_1.equals(checkState)){
|
|
|
|
|
+ SpecialExamination specialExamination = new SpecialExamination();
|
|
|
|
|
+ BeanUtil.copyProperties(specialExaminationVo,specialExamination);
|
|
|
|
|
+ // 暂存特审复开数据
|
|
|
|
|
+ SpecialExamination specialByInfoId = specialExaminationService.getSpecialByInfoId(infoId);
|
|
|
|
|
+ if (null == specialByInfoId){
|
|
|
|
|
+ specialExamination.setInfoId(infoId);
|
|
|
|
|
+ specialExaminationService.save(specialExamination);
|
|
|
|
|
+ }else {
|
|
|
|
|
+ specialExamination.setInfoId(infoId);
|
|
|
|
|
+ specialExamination.setId(specialByInfoId.getId());
|
|
|
|
|
+ specialExaminationService.updateById(specialExamination);
|
|
|
|
|
+ }
|
|
|
|
|
+ // 修改客户状态
|
|
|
|
|
+ customerInfo.setCheckState(CheckStateCode.CHECK_STSTE_1);
|
|
|
|
|
+ customerInfo.setShutdownLabel(specialExamination.getShutdownLabel().toString());
|
|
|
|
|
+ customerInfo.setShutdownLabelDate(specialExamination.getShutdownTime());
|
|
|
|
|
+ infoService.updateById(customerInfo);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
|
|
+
|
|
|
|
|
+ return Result.ok("批量暂存完成");
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
|
|
|
@PostMapping(value = "/status/adopt")
|
|
@PostMapping(value = "/status/adopt")
|
|
|
public Result<?> adopt(@RequestBody SpecialExamination specialExamination) {
|
|
public Result<?> adopt(@RequestBody SpecialExamination specialExamination) {
|
|
@@ -357,13 +418,16 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
|
|
|
*/
|
|
*/
|
|
|
@PostMapping(value = "/{taskId}/importCustomerData")
|
|
@PostMapping(value = "/{taskId}/importCustomerData")
|
|
|
public Result<?> importCustomerData(@PathVariable String taskId, @RequestBody List<SpecialExaminationCustomerVo> list) {
|
|
public Result<?> importCustomerData(@PathVariable String taskId, @RequestBody List<SpecialExaminationCustomerVo> list) {
|
|
|
|
|
+ // 获取当前登录用户
|
|
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
|
+ ISysBaseAPI iSysBaseAPI = SpringContextUtils.getBean(ISysBaseAPI.class);
|
|
|
|
|
+ List<String> departNamesByUsername = iSysBaseAPI.getDepartNamesByUsername(sysUser.getUsername());
|
|
|
|
|
+ // 随斤生成任务ID,批量上传关联文件包
|
|
|
String generate = UUIDGenerator.generate();
|
|
String generate = UUIDGenerator.generate();
|
|
|
- //导入失败数据
|
|
|
|
|
|
|
+ //导入数据
|
|
|
List<SpecialExaminationCustomerVo> listExcel = new ArrayList<>();
|
|
List<SpecialExaminationCustomerVo> listExcel = new ArrayList<>();
|
|
|
int customerCount = 0;
|
|
int customerCount = 0;
|
|
|
- for (int i = 0; i < list.size(); i++) {
|
|
|
|
|
- SpecialExaminationCustomerVo infoVo = list.get(i);
|
|
|
|
|
|
|
+ for (SpecialExaminationCustomerVo infoVo : list) {
|
|
|
SmsCheckCustomerInfo info = new SmsCheckCustomerInfo();
|
|
SmsCheckCustomerInfo info = new SmsCheckCustomerInfo();
|
|
|
BeanUtil.copyProperties(infoVo, info, true);
|
|
BeanUtil.copyProperties(infoVo, info, true);
|
|
|
info.setTaskId(generate);
|
|
info.setTaskId(generate);
|
|
@@ -380,7 +444,16 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
|
|
|
) {
|
|
) {
|
|
|
infoVo.setResult("1");
|
|
infoVo.setResult("1");
|
|
|
customerCount++;
|
|
customerCount++;
|
|
|
- customerInfoService.save(info);
|
|
|
|
|
|
|
+ // 存入客户信息表
|
|
|
|
|
+ boolean save = customerInfoService.save(info);
|
|
|
|
|
+ // 将材有无特审与实名制信息存入特审复开资料表
|
|
|
|
|
+ if (save) {
|
|
|
|
|
+ SpecialExamination specialExamination = new SpecialExamination();
|
|
|
|
|
+ specialExamination.setInfoId(info.getId());
|
|
|
|
|
+ String materialLabel = info.getMaterialLabel();
|
|
|
|
|
+ specialExamination.setMaterialLabel("有".equals(materialLabel) ? 0 : 1);
|
|
|
|
|
+ specialExaminationService.save(specialExamination);
|
|
|
|
|
+ }
|
|
|
} else {
|
|
} else {
|
|
|
infoVo.setResult("0");
|
|
infoVo.setResult("0");
|
|
|
infoVo.setErrorMsg("缺失必填项");
|
|
infoVo.setErrorMsg("缺失必填项");
|
|
@@ -426,6 +499,9 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
|
|
|
int lotStatus = stateBoolean ? 5 : 4;
|
|
int lotStatus = stateBoolean ? 5 : 4;
|
|
|
//修改客户信息稽核结果
|
|
//修改客户信息稽核结果
|
|
|
info.setCheckState(lotStatus);
|
|
info.setCheckState(lotStatus);
|
|
|
|
|
+ if (5 == lotStatus){
|
|
|
|
|
+ info.setReopenTime( new Date());
|
|
|
|
|
+ }
|
|
|
infoService.updateById(info);
|
|
infoService.updateById(info);
|
|
|
return Result.OK("稽核成功!");
|
|
return Result.OK("稽核成功!");
|
|
|
} catch (IllegalAccessException e) {
|
|
} catch (IllegalAccessException e) {
|
|
@@ -464,23 +540,31 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
|
|
|
@PermissionData(pageComponent = "smscheck/modules/TaskCheckList")
|
|
@PermissionData(pageComponent = "smscheck/modules/TaskCheckList")
|
|
|
public Result<Dict> count(HttpServletRequest request) {
|
|
public Result<Dict> count(HttpServletRequest request) {
|
|
|
Dict dict = Dict.create();
|
|
Dict dict = Dict.create();
|
|
|
|
|
+ //0:未处理;1:未完善;2:待稽核; ;4:待整改;5:稽核通过;*/
|
|
|
// 客户总数
|
|
// 客户总数
|
|
|
QueryWrapper<SmsCheckCustomerInfo> countQueryWrapper = QueryGenerator.initQueryWrapper(new SmsCheckCustomerInfo(), request.getParameterMap());
|
|
QueryWrapper<SmsCheckCustomerInfo> countQueryWrapper = QueryGenerator.initQueryWrapper(new SmsCheckCustomerInfo(), request.getParameterMap());
|
|
|
countQueryWrapper.lambda().eq(SmsCheckCustomerInfo::getType, CheckTypeCode.CHECK_TYPE_3)
|
|
countQueryWrapper.lambda().eq(SmsCheckCustomerInfo::getType, CheckTypeCode.CHECK_TYPE_3)
|
|
|
.eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0);
|
|
.eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0);
|
|
|
long count = customerInfoService.count(countQueryWrapper);
|
|
long count = customerInfoService.count(countQueryWrapper);
|
|
|
|
|
|
|
|
- // 未处理数
|
|
|
|
|
|
|
+ // 未处理
|
|
|
|
|
+ QueryWrapper<SmsCheckCustomerInfo> handelCountQueryWrapper = QueryGenerator.initQueryWrapper(new SmsCheckCustomerInfo(), request.getParameterMap());
|
|
|
|
|
+ handelCountQueryWrapper.lambda().eq(SmsCheckCustomerInfo::getType, CheckTypeCode.CHECK_TYPE_3)
|
|
|
|
|
+ .in(SmsCheckCustomerInfo::getCheckState, 0)
|
|
|
|
|
+ .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0);
|
|
|
|
|
+ long handelCount = customerInfoService.count(handelCountQueryWrapper);
|
|
|
|
|
+
|
|
|
|
|
+ // 未完善
|
|
|
QueryWrapper<SmsCheckCustomerInfo> undoCountQueryWrapper = QueryGenerator.initQueryWrapper(new SmsCheckCustomerInfo(), request.getParameterMap());
|
|
QueryWrapper<SmsCheckCustomerInfo> undoCountQueryWrapper = QueryGenerator.initQueryWrapper(new SmsCheckCustomerInfo(), request.getParameterMap());
|
|
|
undoCountQueryWrapper.lambda().eq(SmsCheckCustomerInfo::getType, CheckTypeCode.CHECK_TYPE_3)
|
|
undoCountQueryWrapper.lambda().eq(SmsCheckCustomerInfo::getType, CheckTypeCode.CHECK_TYPE_3)
|
|
|
- .in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(0, 1))
|
|
|
|
|
|
|
+ .in(SmsCheckCustomerInfo::getCheckState, 1)
|
|
|
.eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0);
|
|
.eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0);
|
|
|
long undoCount = customerInfoService.count(undoCountQueryWrapper);
|
|
long undoCount = customerInfoService.count(undoCountQueryWrapper);
|
|
|
|
|
|
|
|
// 待稽核数
|
|
// 待稽核数
|
|
|
QueryWrapper<SmsCheckCustomerInfo> uncheckCountQueryWrapper = QueryGenerator.initQueryWrapper(new SmsCheckCustomerInfo(), request.getParameterMap());
|
|
QueryWrapper<SmsCheckCustomerInfo> uncheckCountQueryWrapper = QueryGenerator.initQueryWrapper(new SmsCheckCustomerInfo(), request.getParameterMap());
|
|
|
uncheckCountQueryWrapper.lambda().eq(SmsCheckCustomerInfo::getType, CheckTypeCode.CHECK_TYPE_3)
|
|
uncheckCountQueryWrapper.lambda().eq(SmsCheckCustomerInfo::getType, CheckTypeCode.CHECK_TYPE_3)
|
|
|
- .in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(2, 3))
|
|
|
|
|
|
|
+ .in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(2))
|
|
|
.eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0);
|
|
.eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0);
|
|
|
long uncheckCount = customerInfoService.count(uncheckCountQueryWrapper);
|
|
long uncheckCount = customerInfoService.count(uncheckCountQueryWrapper);
|
|
|
|
|
|
|
@@ -499,6 +583,7 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
|
|
|
long passedCount = customerInfoService.count(passedCountQueryWrapper);
|
|
long passedCount = customerInfoService.count(passedCountQueryWrapper);
|
|
|
|
|
|
|
|
dict.put("count", count);
|
|
dict.put("count", count);
|
|
|
|
|
+ dict.put("handleCount", handelCount);
|
|
|
dict.put("undoCount", undoCount);
|
|
dict.put("undoCount", undoCount);
|
|
|
dict.put("uncheckCount", uncheckCount);
|
|
dict.put("uncheckCount", uncheckCount);
|
|
|
dict.put("checkedCount", checkedCount);
|
|
dict.put("checkedCount", checkedCount);
|