功能调整：根据稽核状态查询稽核工作日志

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.smscheck.controller;
 
+import com.alibaba.druid.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -20,6 +21,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @description 稽核工作日志
@@ -156,13 +158,13 @@ public class SmsCheckWorkLogController extends JeecgController<SmsCheckWorkLog,
 
 	/**
 	 *
-	 * @param smsCheckWorkLog
+	 * @param parameterMap
 	 * @return
 	 */
 	@ApiOperation(value="稽核工作日志-稽核状态", notes="稽核工作日志-稽核状态")
 	@GetMapping(value = "/check/state")
-	public Result<List<SmsCheckWorkLog>> selectCheckState(SmsCheckWorkLog smsCheckWorkLog){
-		List<SmsCheckWorkLog> checkState = smsCheckWorkLogService.checkState(smsCheckWorkLog);
+	public Result<List<SmsCheckWorkLog>> selectCheckState(@RequestParam Map<String, String> parameterMap){
+		List<SmsCheckWorkLog> checkState = smsCheckWorkLogService.checkState(parameterMap);
 		return Result.ok(checkState);
 	}
 }

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

@@ -1,10 +1,13 @@
 package org.jeecg.modules.smscheck.mapper;
 
+import com.alibaba.druid.util.StringUtils;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.SelectProvider;
 import org.jeecg.modules.smscheck.entity.SmsCheckWorkLog;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @description 稽核工作日志
@@ -14,18 +17,67 @@ import java.util.List;
  */
 public interface SmsCheckWorkLogMapper extends BaseMapper<SmsCheckWorkLog> {
 
-    @Select("SELECT DATE_FORMAT(create_time, '%Y-%m-%d') create_time, COUNT(*) basic_check_state\n" +
-            "FROM sms_check_work_log WHERE  basic_check_state=#{basicCheckState}\n" +
-            "GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d');")
-    List<SmsCheckWorkLog> basicCheckState(SmsCheckWorkLog smsCheckWorkLog);
+    @SelectProvider(type = SmsCheckWorkLogProvider.class,method = "basicCheckState")
+    List<SmsCheckWorkLog> basicCheckState( Map<String, String> parameterMap);
 
-    @Select("SELECT DATE_FORMAT(create_time, '%Y-%m-%d') create_time, COUNT(*) standard_check_state\n" +
-            "FROM sms_check_work_log WHERE  standard_check_state=#{standardCheckState}\n" +
-            "GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d');")
-    List<SmsCheckWorkLog> standardCheckState(SmsCheckWorkLog smsCheckWorkLog);
+    @SelectProvider(type = SmsCheckWorkLogProvider.class,method = "standardCheckState")
+    List<SmsCheckWorkLog> standardCheckState(Map<String, String> parameterMap);
 
-    @Select("SELECT DATE_FORMAT(create_time, '%Y-%m-%d') create_time, COUNT(*) data_check_state\n" +
-            "FROM sms_check_work_log WHERE  data_check_state=#{dataCheckState}\n" +
-            "GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d');")
-    List<SmsCheckWorkLog> dataCheckState(SmsCheckWorkLog smsCheckWorkLog);
+    @SelectProvider(type = SmsCheckWorkLogProvider.class,method = "dataCheckState")
+    List<SmsCheckWorkLog> dataCheckState(Map<String, String> parameterMap);
+
+
+
+    class SmsCheckWorkLogProvider{
+        public String basicCheckState(Map<String, String> parameterMap){
+            StringBuilder sql = new StringBuilder();
+            String basicCheckState = parameterMap.get("basicCheckState");
+            if (!StringUtils.isEmpty(basicCheckState)){
+
+                sql.append("SELECT DATE_FORMAT(create_time, '%Y-%m-%d') create_time, COUNT(*) basic_check_state FROM sms_check_work_log");
+
+                sql.append(" WHERE  basic_check_state=#{basicCheckState} ");
+                String startTime = parameterMap.get("startTime");
+                String endTime = parameterMap.get("endTime");
+                if (!StringUtils.isEmpty(startTime)&&!StringUtils.isEmpty(endTime)){
+                    sql.append("AND create_time> #{startTime} AND create_time< #{endTime} ");
+                }
+                sql.append("GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d')");
+            }
+           return sql.toString();
+        }
+        public String standardCheckState(Map<String, String> parameterMap){
+            StringBuilder sql = new StringBuilder();
+
+            String standardCheckState = parameterMap.get("standardCheckState");
+            if (!StringUtils.isEmpty(standardCheckState)){
+                sql.append("SELECT DATE_FORMAT(create_time, '%Y-%m-%d') create_time, COUNT(*) standardCheckState FROM sms_check_work_log");
+                sql.append(" WHERE  standard_check_state=#{standardCheckState} ");
+                String startTime = parameterMap.get("startTime");
+                String endTime = parameterMap.get("endTime");
+                if (!StringUtils.isEmpty(startTime)&&!StringUtils.isEmpty(endTime)){
+                    sql.append("AND create_time> #{startTime} AND create_time< #{endTime} ");
+                }
+                sql.append("GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d')");
+            }
+           return sql.toString();
+        }
+        public String dataCheckState(Map<String, String> parameterMap){
+            StringBuilder sql = new StringBuilder();
+
+            String dataCheckState = parameterMap.get("dataCheckState");
+            if (!StringUtils.isEmpty(dataCheckState)){
+                sql.append("SELECT DATE_FORMAT(create_time, '%Y-%m-%d') create_time, COUNT(*) data_check_state FROM sms_check_work_log");
+
+                sql.append(" WHERE  data_check_state=#{dataCheckState} ");
+                String startTime = parameterMap.get("startTime");
+                String endTime = parameterMap.get("endTime");
+                if (!StringUtils.isEmpty(startTime)&&!StringUtils.isEmpty(endTime)){
+                    sql.append("AND create_time> #{startTime} AND create_time< #{endTime} ");
+                }
+                sql.append("GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d')");
+            }
+           return sql.toString();
+        }
+    }
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.smscheck.entity.SmsCheckWorkLog;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @description 稽核工作日志
@@ -13,5 +14,5 @@ import java.util.List;
  */
 public interface ISmsCheckWorkLogService extends IService<SmsCheckWorkLog> {
 
-    List<SmsCheckWorkLog> checkState(SmsCheckWorkLog smsCheckWorkLog);
+    List<SmsCheckWorkLog> checkState(Map<String, String> parameterMap);
 }

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

@@ -1,6 +1,9 @@
 package org.jeecg.modules.smscheck.service.impl;
 
+import com.alibaba.druid.util.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.smscheck.entity.SmsCheckWorkLog;
 import org.jeecg.modules.smscheck.mapper.SmsCheckWorkLogMapper;
 import org.jeecg.modules.smscheck.service.ISmsCheckWorkLogService;
@@ -8,9 +11,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -26,10 +27,10 @@ public class SmsCheckWorkLogServiceImpl extends ServiceImpl<SmsCheckWorkLogMappe
     @Resource
     private SmsCheckWorkLogMapper smsCheckWorkLogMapper;
 
-    public List<SmsCheckWorkLog> checkState(SmsCheckWorkLog smsCheckWorkLog){
-        List<SmsCheckWorkLog> basicCheckState = smsCheckWorkLogMapper.basicCheckState(smsCheckWorkLog);
-        List<SmsCheckWorkLog> standardCheckState = smsCheckWorkLogMapper.standardCheckState(smsCheckWorkLog);
-        List<SmsCheckWorkLog> dataCheckState = smsCheckWorkLogMapper.dataCheckState(smsCheckWorkLog);
+    public List<SmsCheckWorkLog> checkState(Map<String, String> parameterMap){
+        List<SmsCheckWorkLog> basicCheckState = smsCheckWorkLogMapper.basicCheckState(parameterMap);
+        List<SmsCheckWorkLog> standardCheckState = smsCheckWorkLogMapper.standardCheckState(parameterMap);
+        List<SmsCheckWorkLog> dataCheckState = smsCheckWorkLogMapper.dataCheckState(parameterMap);
         List<SmsCheckWorkLog> checkState = new ArrayList<>();
         for (int i = 0;i<basicCheckState.size() ;i++) {
 
@@ -41,4 +42,5 @@ public class SmsCheckWorkLogServiceImpl extends ServiceImpl<SmsCheckWorkLogMappe
         }
         return checkState;
     }
+
 }