用户状态

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

@@ -136,6 +136,9 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
             smsCheckCustomerInfo.setId(smsCheckCustomerData.getInfoId());
             smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_2);
             smsCheckCustomerInfo.setDataId(smsCheckCustomerData.getId());
+            if (jsonObject.get("userState")!=null){
+                smsCheckCustomerInfo.setUserState(jsonObject.get("userState").toString());
+            }
             infoService.updateState(smsCheckCustomerInfo);
             return Result.OK();
         }
@@ -525,6 +528,9 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
             /** 稽核状态 0：未处理；1：未完善；2：待稽核； ；4：待整改；5：稽核通过； 6：未上传 */
             smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_1);
             smsCheckCustomerInfo.setId(smsCheckCustomerData.getInfoId());
+            if (jsonObject.get("userState")!=null){
+                smsCheckCustomerInfo.setUserState(jsonObject.get("userState").toString());
+            }
             infoService.updateState(smsCheckCustomerInfo);
             return Result.OK();
         }
@@ -660,9 +666,13 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
         LambdaQueryWrapper<SmsCheckCustomerDataLog> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SmsCheckCustomerDataLog::getInfoId, infoId);
         SmsCheckCustomerDataLog logServiceOne = checkCustomerDataLogService.getOne(queryWrapper);
-        LambdaQueryWrapper<SmsCheckZGHistory> var11 = new LambdaQueryWrapper<SmsCheckZGHistory>()
-                .eq(SmsCheckZGHistory::getDataId, smsCheckCustomerData.getId());
-        List<SmsCheckZGHistory> list = smsCheckZGHistoryService.list(var11);
+        List<SmsCheckZGHistory> list =null;
+        if (smsCheckCustomerData!=null){
+            LambdaQueryWrapper<SmsCheckZGHistory> var11 = new LambdaQueryWrapper<SmsCheckZGHistory>()
+                    .eq(SmsCheckZGHistory::getDataId, smsCheckCustomerData.getId());
+            list=smsCheckZGHistoryService.list(var11);
+        }
+
         Map<String, Object> stringObjectMap = BeanUtil.beanToMap(logServiceOne);
         Map<String, Object> stringObjectMap1 = BeanUtil.beanToMap(smsCheckCustomerData);
         if (smsCheckCustomerData!=null){

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

@@ -1459,8 +1459,9 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         String startDate = parameterMap.get("startDate");
         String endDate = parameterMap.get("endDate");
         String taskId = parameterMap.get("taskId");
+        String taskType = parameterMap.get("taskType");
         try {
-            List<SmsCustomerInfoGroupByCheckState> smsCustomerInfoGroupByCheckStates = customerInfoService.groupCheckState(startDate, endDate, taskId);
+            List<SmsCustomerInfoGroupByCheckState> smsCustomerInfoGroupByCheckStates = customerInfoService.groupCheckState(startDate, endDate, taskId,taskType);
             return Result.ok(smsCustomerInfoGroupByCheckStates);
         } catch (Exception e) {
             throw new RuntimeException(e);

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

@@ -617,11 +617,11 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
             vo.setStaffName(sysUser.getRealname());
             vo.setStaffUsername( sysUser.getUsername());
             Integer status = sysUser.getStatus();
-            if (status!=1){
-                vo.setUserState("冻结");
-            }else {
-                vo.setUserState("正常");
-            }
+//            if (status!=1){
+//                vo.setUserState("冻结");
+//            }else {
+//                vo.setUserState("正常");
+//            }
             orgCode = sysUser.getOrgCode();
         }
         //员工二级部门

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

@@ -180,8 +180,8 @@ public class SmsCheckWorkLogController extends JeecgController<SmsCheckWorkLog,
 		String startDate = parameterMap.get("startDate");
 		String endDate = parameterMap.get("endDate");
 		String infoId = parameterMap.get("infoId");
-
-		List<AbnormalAudit> abnormalAudits = smsCheckWorkLogService.basicCheckStateCount(startDate, endDate, infoId);
+		String type = parameterMap.get("taskType");
+		List<AbnormalAudit> abnormalAudits = smsCheckWorkLogService.basicCheckStateCount(startDate, endDate, infoId,type);
 		for (AbnormalAudit basicCheck : abnormalAudits){
 			basicCheck.setName("basicCheckState");
 		}
@@ -225,7 +225,8 @@ public class SmsCheckWorkLogController extends JeecgController<SmsCheckWorkLog,
 		String startDate = parameterMap.get("startDate");
 		String endDate = parameterMap.get("endDate");
 			String infoId = parameterMap.get("infoId");
-		List<AbnormalAudit> abnormalAudits = smsCheckWorkLogService.abnormalCreateCount(startDate, endDate, infoId);
+		String taskType = parameterMap.get("taskType");
+		List<AbnormalAudit> abnormalAudits = smsCheckWorkLogService.abnormalCreateCount(startDate, endDate, infoId,taskType);
 		return Result.ok(abnormalAudits);
 	}
 

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

@@ -49,7 +49,7 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
     List<SmsCheckCustomerInfoTaskVo> checkInfoWarningPageList(Integer pageNo, Integer pageSize);
 
     @SelectProvider(type = ProviderClass.class, method = "groupCheckState")
-    List<SmsCustomerInfoGroupByCheckState> groupCheckState(String startDate, String endDate,String taskId);
+    List<SmsCustomerInfoGroupByCheckState> groupCheckState(String startDate, String endDate,String taskId,String taskType);
 
     class ProviderClass {
 
@@ -65,17 +65,20 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
         }
 
 
-        public String groupCheckState(String startDate, String endDate, String taskId) {
+        public String groupCheckState(String startDate, String endDate, String taskId,String taskType) {
             StringBuilder sql = new StringBuilder();
 
-            sql.append("SELECT COUNT(id) as count ,check_state as checkState " +
-                    "from sms_check_customer_info ");
+            sql.append("SELECT COUNT(*) as count ,check_state as checkState " +
+                    "from sms_check_customer_info  LEFT JOIN sms_check_task on sms_check_task.id =sms_check_customer_info.task_id  ");
 
             if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)){
-                sql.append(" WHERE create_time >= '" + startDate + "'");
-                sql.append(" and create_time <= '" + endDate + "'");
+                sql.append(" WHERE sms_check_customer_info.create_time >= '" + startDate + "'");
+                sql.append(" and sms_check_customer_info.create_time <= '" + endDate + "'");
 
             }
+            if (StringUtils.isNotBlank(taskType)){
+                sql.append(" and  sms_check_task.type = " + taskType + "");
+            }
 
             if (StringUtils.isNotBlank(taskId)){
                 sql.append(" and task_id = '" + taskId + "'");
@@ -113,6 +116,9 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
             if (StringUtils.isNotBlank(smsCheckCustomerInfo.getDataLogId())){
                 stringBuilder.append( "  ,data_log_id='"+smsCheckCustomerInfo.getDataLogId()+"' ");
             }
+            if (StringUtils.isNotBlank(smsCheckCustomerInfo.getUserState())){
+                stringBuilder.append( "  ,user_state='"+smsCheckCustomerInfo.getUserState()+"' ");
+            }
             stringBuilder.append( "    where id ='"+smsCheckCustomerInfo.getId()+"' ");
             return stringBuilder.toString();
         }

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

@@ -32,7 +32,7 @@ public interface SmsCheckWorkLogMapper extends BaseMapper<SmsCheckWorkLog> {
 
 
     @SelectProvider(type = SmsCheckWorkLogProvider.class,method = "basicCheckStateCount")
-    List<AbnormalAudit> basicCheckStateCount(String startDate, String endDate, String infoId);
+    List<AbnormalAudit> basicCheckStateCount(String startDate, String endDate, String infoId,String type);
 
     @SelectProvider(type = SmsCheckWorkLogProvider.class,method = "standardCheckStateCount")
     List<AbnormalAudit> standardCheckStateCount(String startDate, String endDate, String infoId);
@@ -41,7 +41,7 @@ public interface SmsCheckWorkLogMapper extends BaseMapper<SmsCheckWorkLog> {
     List<AbnormalAudit> dataCheckStateCount(String startDate, String endDate, String infoId);
 
     @SelectProvider(type = SmsCheckWorkLogProvider.class,method = "abnormalCreateCount")
-    List<AbnormalAudit> abnormalCreateCount(String startDate, String endDate, String infoId);
+    List<AbnormalAudit> abnormalCreateCount(String startDate, String endDate, String infoId,String taskType);
 
 
     @SelectProvider(type = SmsCheckWorkLogProvider.class,method = "findStaffNoCount")
@@ -94,11 +94,12 @@ public interface SmsCheckWorkLogMapper extends BaseMapper<SmsCheckWorkLog> {
         };
 
 
-        public String basicCheckStateCount(String startDate, String endDate, String infoId){
+        public String basicCheckStateCount(String startDate, String endDate, String infoId,String type){
             StringBuilder sql = new StringBuilder();
             sql.append("SELECT scwl.basic_check_state as state, COUNT(scwl.basic_check_state) as count ");
             sql.append(" FROM sms_check_customer_info scci ");
             sql.append(" LEFT JOIN sms_check_work_log scwl ON scci.id = scwl.info_id ");
+            sql.append("  LEFT JOIN sms_check_task on sms_check_task.id =scci.task_id  ");
             sql.append(" WHERE scwl.basic_check_state is not NULL ");
             /*if (!StringUtils.isEmpty(startDate)){
                 sql.append(" AND scci.create_time >= '"+startDate+"' ");
@@ -106,7 +107,9 @@ public interface SmsCheckWorkLogMapper extends BaseMapper<SmsCheckWorkLog> {
             if (!StringUtils.isEmpty(endDate)){
                 sql.append(" AND scci.create_time <='" + endDate+"' ");
             }*/
-
+            if (!StringUtils.isEmpty(type)){
+                sql.append(" AND sms_check_task.type = " + type + " ");
+            }
             if (!StringUtils.isEmpty(infoId)){
                 sql.append(" AND scwl.info_id = '" + infoId + "' ");
             }

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

@@ -32,7 +32,7 @@ public interface ISmsCheckCustomerInfoService extends IService<SmsCheckCustomerI
 
     List<SmsCheckCustomerInfoTaskVo> checkInfoWarningPageList(Integer pageNo, Integer pageSize);
 
-    List<SmsCustomerInfoGroupByCheckState> groupCheckState(String startDate, String endDate,String taskId);
+    List<SmsCustomerInfoGroupByCheckState> groupCheckState(String startDate, String endDate,String taskId,String taskType);
 
     List<SysDepartModel> getSysDepartModel();
 

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

@@ -19,13 +19,13 @@ public interface ISmsCheckWorkLogService extends IService<SmsCheckWorkLog> {
 
 
 
-    List<AbnormalAudit> basicCheckStateCount(String startDate, String endDate, String infoId);
+    List<AbnormalAudit> basicCheckStateCount(String startDate, String endDate, String infoId,String type);
 
     List<AbnormalAudit> standardCheckStateCount(String startDate, String endDate, String infoId);
 
     List<AbnormalAudit> dataCheckStateCount(String startDate, String endDate, String infoId);
 
-    List<AbnormalAudit> abnormalCreateCount(String startDate, String endDate, String infoId);
+    List<AbnormalAudit> abnormalCreateCount(String startDate, String endDate, String infoId,String taskType);
 
     List<AbnormalAudit> findStaffNoCount(String startDate, String endDate, String infoId);
 

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

@@ -50,8 +50,8 @@ public class SmsCheckCustomerInfoServiceImpl extends ServiceImpl<SmsCheckCustome
     }
 
     @Override
-    public List<SmsCustomerInfoGroupByCheckState> groupCheckState(String startDate, String endDate,String id) {
-        return smsCheckCustomerInfoMapper.groupCheckState( startDate,  endDate,id);
+    public List<SmsCustomerInfoGroupByCheckState> groupCheckState(String startDate, String endDate,String id,String taskType) {
+        return smsCheckCustomerInfoMapper.groupCheckState( startDate,  endDate,id,taskType);
     }
 
     @Override

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

@@ -45,8 +45,8 @@ public class SmsCheckWorkLogServiceImpl extends ServiceImpl<SmsCheckWorkLogMappe
     }
 
     @Override
-    public List<AbnormalAudit> basicCheckStateCount(String startDate, String endDate, String infoId) {
-        return smsCheckWorkLogMapper.basicCheckStateCount(startDate,endDate,infoId);
+    public List<AbnormalAudit> basicCheckStateCount(String startDate, String endDate, String infoId,String type) {
+        return smsCheckWorkLogMapper.basicCheckStateCount(startDate,endDate,infoId,type);
     }
 
     @Override
@@ -60,8 +60,8 @@ public class SmsCheckWorkLogServiceImpl extends ServiceImpl<SmsCheckWorkLogMappe
     }
 
     @Override
-    public List<AbnormalAudit> abnormalCreateCount(String startDate, String endDate, String infoId) {
-        return smsCheckWorkLogMapper.abnormalCreateCount(startDate,endDate,infoId);
+    public List<AbnormalAudit> abnormalCreateCount(String startDate, String endDate, String infoId,String taskType) {
+        return smsCheckWorkLogMapper.abnormalCreateCount(startDate,endDate,infoId,taskType);
     }
 
     @Override