修改审核角色不对应和填报超时统计

src/main/java/com/keymobile/indicators/api/hytobacco/TaskCtrl.java

@@ -143,12 +143,14 @@ public class TaskCtrl  {
         List<TaskStatusCountResult> countResults = taskService.countTask(param);
         if (CollectionUtils.isNotEmpty(countResults)) {
             int count = 0;
+            int toEditCount = 0;
             for (TaskStatusCountResult countResult : countResults) {
                 if (countResult.getStatus() != null) {
                     switch (countResult.getStatus()) {
-                        case Constants.APPLY_STATE_DRAFT:
+                        case Constants.APPLY_STATE_ISSUE:
+                        case Constants.APPLY_STATE_DRAFT :
                             count += countResult.getCount();
-                            result.setToEditCount(countResult.getCount());
+                            toEditCount += countResult.getCount();
                             break;
                         case Constants.APPLY_STATE_AUDITING:
                             count += countResult.getCount();
@@ -164,6 +166,7 @@ public class TaskCtrl  {
                     }
                 }
             }
+            result.setToEditCount(toEditCount);
             result.setTotalCount(count);
             //获取填报超时审核超时数
             TaskAnalysisResult taskAnalysisResult = taskService.stateCounts(param);

src/main/java/com/keymobile/indicators/service/dataenter/impl/TaskServiceImpl.java

@@ -280,14 +280,25 @@ public class TaskServiceImpl implements TaskService {
         Date now = new Date();
         Task task = taskMapper.getById(taskId);
         String ruleLevel = task.getRuleLevel();
+        String orgNo = task.getOrgNo();
         ConfigInfo configInfo = null;
-        if (Constants.PRIVINCE_TO_CITY.equals(ruleLevel)) {
-            configInfo = configInfoService.getConfigInfoById(Constants.RULE_PROVINCE_AUDIT_ROLE);
-        } else if (Constants.PRIVINCE_TO_COUNTY.equals(ruleLevel)) {
-            configInfo = configInfoService.getConfigInfoById(Constants.RULE_CITY_AUDIT_ROLE);
-        } else if (Constants.CITY_TO_COUNTY.equals(ruleLevel)) {
-            configInfo = configInfoService.getConfigInfoById(Constants.RULE_COUNTY_AUDIT_ROLE);
+        if(StringUtils.isNotBlank(orgNo)){
+            if(orgNo.length()==2){
+                configInfo = configInfoService.getConfigInfoById(Constants.RULE_PROVINCE_AUDIT_ROLE);
+            }else if(orgNo.length()==4){
+                configInfo = configInfoService.getConfigInfoById(Constants.RULE_CITY_AUDIT_ROLE);
+            }else if(orgNo.length()==6){
+                configInfo = configInfoService.getConfigInfoById(Constants.RULE_COUNTY_AUDIT_ROLE);
+            }
         }
+//        ConfigInfo configInfo = null;
+//        if (Constants.PRIVINCE_TO_CITY.equals(ruleLevel)) {
+//            configInfo = configInfoService.getConfigInfoById(Constants.RULE_PROVINCE_AUDIT_ROLE);
+//        } else if (Constants.PRIVINCE_TO_COUNTY.equals(ruleLevel)) {
+//            configInfo = configInfoService.getConfigInfoById(Constants.RULE_CITY_AUDIT_ROLE);
+//        } else if (Constants.CITY_TO_COUNTY.equals(ruleLevel)) {
+//            configInfo = configInfoService.getConfigInfoById(Constants.RULE_COUNTY_AUDIT_ROLE);
+//        }
         if (configInfo != null) {
             String indDept = task.getRefIndDept();
             List<RoleRefUserModel> users = getUserByRoleIdStr(configInfo.getCfValue());

src/main/resources/mybatis/mapping/TaskMapper.xml

@@ -150,13 +150,13 @@
         select count(id)  from data_enter_task
         <include refid="findTaskWhereSql"></include>
         <if test="states != null and states != 0">
-        and status = #{states}
+
         <choose>
         <when test="states == 1">
-            and end_date &lt; curdate()
+            and  status in (1,5) and end_date &lt; curdate()
         </when>
         <when test=" states == 2 ">
-            and audit_end_date &lt; curdate()
+            and  status =2 and audit_end_date &lt; curdate()
         </when>
         </choose>
         </if>