Merge branch 'hy-tobacco' of ssh://132.232.112.242:7022/zhangkb/indicators into hy-tobacco

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

@@ -110,6 +110,32 @@ public class TaskCtrl  {
     @PostMapping("analysis")
     public TaskAnalysisResult analysis(@RequestBody QueryTaskParam param) {
         TaskAnalysisResult result = new TaskAnalysisResult();
+        List<TaskStatusCountResult> countResults = taskService.countTask(param);
+        if (CollectionUtils.isNotEmpty(countResults)) {
+            int count = 0;
+            for (TaskStatusCountResult countResult : countResults) {
+                if (countResult.getStatus() != null) {
+                    switch (countResult.getStatus()) {
+                        case Constants.APPLY_STATE_DRAFT:
+                            count += countResult.getCount();
+                            result.setToEditCount(countResult.getCount());
+                            break;
+                        case Constants.APPLY_STATE_AUDITING:
+                            count += countResult.getCount();
+                            result.setToAuditCount(countResult.getCount());
+                            break;
+                        case Constants.APPLY_STATE_PASSED:
+                            count += countResult.getCount();
+                            result.setPassCount(countResult.getCount());
+                            break;
+                        default:
+                            count += countResult.getCount();
+                            break;
+                    }
+                }
+            }
+            result.setTotalCount(count);
+        }
         return result;
     }
 

src/main/java/com/keymobile/indicators/model/entity/dataenter/TaskAnalysisResult.java

@@ -17,4 +17,11 @@ public class TaskAnalysisResult {
 
     @ApiModelProperty("待填报总数")
     private int toEditCount;
+
+    @ApiModelProperty("已审核通过总数")
+    private int passCount;
+
+//    @ApiModelProperty("被驳回总数")
+//    private int rejectCount;
+
 }

src/main/java/com/keymobile/indicators/service/dataenter/TaskService.java

@@ -79,6 +79,12 @@ public interface TaskService {
     Page<Task> findTask(QueryTaskParam param);
 
     /**
+     * 根据审批状态统计任务
+     * @param param
+     * @return
+     */
+    List<TaskStatusCountResult> countTask(QueryTaskParam param);
+    /**
      * 根据条件查询所有任务
      * @param param
      * @return

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

@@ -168,6 +168,11 @@ public class TaskServiceImpl implements TaskService {
     }
 
     @Override
+    public List<TaskStatusCountResult> countTask(QueryTaskParam param) {
+        return taskMapper.countTask(param);
+    }
+
+    @Override
     public List<Task> findAllTask(QueryAllTaskParam param) {
         return taskMapper.findAllTask(param);
     }
@@ -327,7 +332,7 @@ public class TaskServiceImpl implements TaskService {
         Date now = new Date();
         Task task = taskMapper.getById(auditResult.getTaskId());
         task.setUpdateTime(now);
-        int status = Constants.APPLY_STATE_REJECTED;
+        int status = Constants.APPLY_STATE_DRAFT;
         String recordType = "审批拒绝";
         if (auditResult.isResult()) {
             status = Constants.APPLY_STATE_PASSED;

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

@@ -97,13 +97,13 @@
 
     <resultMap type="com.keymobile.indicators.model.entity.dataenter.TaskStatusCountResult" id="taskStatusCountResult">
         <result property="status" column="status" javaType="INTEGER" jdbcType="INTEGER"/>
-        <result property="count" column="cf_value" javaType="INTEGER" jdbcType="INTEGER"/>
+        <result property="count" column="count" javaType="INTEGER" jdbcType="INTEGER"/>
     </resultMap>
 
     <select id="countTask" parameterType="com.keymobile.indicators.model.entity.dataenter.QueryAllTaskParam"
         resultMap="taskStatusCountResult">
         select count(id) as count,
-          status,
+          status
         from data_enter_task
         <include refid="findTaskWhereSql"></include>
         group by status