修改任务审批接口

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

 package com.keymobile.indicators.api.hytobacco;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.keymobile.indicators.constant.Constants;
 import com.keymobile.indicators.model.entity.AuthModel;
@@ -64,10 +65,10 @@ public class DataEnterCtrl {
                 List<String> idList = Arrays.asList(ids);
                 switch (groupObj.getObjType()) {
                     case Constants.OBJ_TYPE_ORG:
-                        List<JSONObject> orgs = systemAuthService.getOrgByIds(idList);
-                        for (JSONObject jo : orgs) {
-
-                        }
+                        List<JSONObject> orgs = systemAuthService.getOrgByNos(idList);
+//                        for (JSONObject jo : orgs) {
+//
+//                        }
                         break;
                 }
                 if (objs.isEmpty()) {

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

@@ -42,7 +42,7 @@ public class TaskCtrl  {
 
     @ApiOperation("(启动)根据规则生成相关填报任务")
     @GetMapping("generateTaskByRule")
-    public Result generateTaskByRule(@ApiParam("规则id") @RequestParam("ruleId") List<Integer> ruleIds,
+    public Result generateTaskByRule(@ApiParam("规则id") @RequestParam("ruleIds") List<Integer> ruleIds,
                                      @ApiParam("收数月份, 格式: 2020-03、2020-06、2020-09、2020-12") @RequestParam("valueTime")String valueTime) {
         Result result = null;
         if (CollectionUtils.isNotEmpty(ruleIds)) {
@@ -90,8 +90,7 @@ public class TaskCtrl  {
     @ApiOperation("提交任务去审核")
     @GetMapping("toSubmit")
     public Result toSubmit(@ApiParam("任务id") @RequestParam("taskId") String id) {
-        taskService.submitTask(id, SystemUserUtil.getCurrentUserId());
-        return Result.genOkResult();
+        return taskService.submitTask(id, SystemUserUtil.getCurrentUserId());
     }
 
     @ApiOperation("审核任务")

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

 package com.keymobile.indicators.api.hytobacco;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.keymobile.indicators.constant.Constants;
 import com.keymobile.indicators.model.entity.ConfigInfo;
@@ -133,7 +134,8 @@ public class TaskRuleCtrl {
             String value = configInfo.getCfValue();
             List<String> ids = Arrays.asList(StringUtils.split(value, Constants.SEP_COMMA));
             List<JSONObject> roles = systemAuthService.getRolesByIds(ids);
-            for (JSONObject role : roles) {
+            for (int i= 0; i < roles.size(); i++) {
+                JSONObject role = roles.get(i);
                 RoleModel r = new RoleModel();
                 r.setId(role.getString("id"));
                 r.setName(role.getString("disname"));

src/main/java/com/keymobile/indicators/constant/Constants.java

@@ -139,5 +139,16 @@ public class Constants {
      */
     public static final String RULE_COUNTY_AUDIT_ROLE = "COUNTY_AUDIT_ROLE";
 
-
+    /**
+     * ruleType=1 省级对标
+     */
+    public static final int RULE_TYPE_PROVINCE = 1;
+    /**
+     * ruleType=2 市级对标
+     */
+    public static final int RULE_TYPE_CITY = 2;
+    /**
+     * ruleType=3 县级对标
+     */
+    public static final int RULE_TYPE_COUNTY = 3;
 }

src/main/java/com/keymobile/indicators/model/entity/OrgModel.java

@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
 @Data
-@ApiModel("角色对象")
+@ApiModel("组织对象")
 public class OrgModel {
 
     private String id;

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

@@ -8,7 +8,7 @@ import lombok.Data;
 @Data
 public class QueryAllTaskParam {
 
-    @ApiModelProperty(name = "规则类型：1 省级 2 市级 3 县级")
+    @ApiModelProperty("规则类型：1 省级 2 市级 3 县级")
     private Integer ruleType;
     /**
      * 任务级别：省对市  省对县 市对县
@@ -19,15 +19,18 @@ public class QueryAllTaskParam {
     /**
      * 查询类型：1 查找填报人任务 2 查找审核人任务 3 查找全部
      */
-    @ApiModelProperty(name = "查询类型：1 查找填报人任务 2 查找审核人任务 3 查找全部")
+    @ApiModelProperty("查询类型：1 查找填报人任务 2 查找审核人任务 3 查找全部")
     private int queryType = 1;
-    @ApiModelProperty(name = "搜索关键字（名字）")
+    @ApiModelProperty("搜索关键字（名字）")
     private String keyword;
-    @ApiModelProperty(name = "填报时间")
+    @ApiModelProperty("填报时间")
     private String valueTime;
-    @ApiModelProperty(name = "任务状态：1、填报中 2、审批中 3、审核通过 4、驳回")
+    @ApiModelProperty("任务状态：1、填报中 2、审批中 3、审核通过 4、驳回")
     private Integer status;
 
+    @ApiModelProperty("归属部门，对应数据项的归属部门")
+    private String refIndDept;
+
     @ApiModelProperty("当前用户id，不用传")
     private String userId;
 }

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

@@ -8,7 +8,7 @@ import lombok.Data;
 @Data
 public class QueryTaskParam {
 
-    @ApiModelProperty(name = "规则类型：1 省级 2 市级 3 县级")
+    @ApiModelProperty("规则类型：1 省级 2 市级 3 县级")
     private Integer ruleType;
 
     /**
@@ -19,20 +19,23 @@ public class QueryTaskParam {
     /**
      * 查询类型：1 查找填报人任务 2 查找审核人任务 3 查找全部
      */
-    @ApiModelProperty(name = "查询类型：1 查找填报人任务 2 查找审核人任务 3 查找全部")
+    @ApiModelProperty("查询类型：1 查找填报人任务 2 查找审核人任务 3 查找全部")
     private int queryType = 1;
 
     private String userId;
 
-    @ApiModelProperty(name = "搜索关键字（名字）")
+    @ApiModelProperty("搜索关键字（名字）")
     private String keyword;
-    @ApiModelProperty(name = "填报时间")
+    @ApiModelProperty("填报时间")
     private String valueTime;
-    @ApiModelProperty(name = "任务状态：1、填报中 2、审批中 3、审核通过 4、驳回")
+    @ApiModelProperty("任务状态：1、填报中 2、审批中 3、审核通过 4、驳回")
     private Integer status;
-    @ApiModelProperty(name = "页码，从1开始")
+    @ApiModelProperty("归属部门，对应数据项的归属部门")
+    private String refIndDept;
+
+    @ApiModelProperty("页码，从1开始")
     private int page = 1;
-    @ApiModelProperty(name = "每页条数")
+    @ApiModelProperty("每页条数")
     private int pageSize = 10;
 
     /**

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

@@ -56,6 +56,9 @@ public class Task extends BaseModel {
     @ApiModelProperty("任务规则名称")
     private String ruleName;
 
+    @ApiModelProperty("归属部门（指标归属部门）")
+    private String refIndDept;
+
     /**
      * 任务单位id
      */
@@ -94,6 +97,11 @@ public class Task extends BaseModel {
     private String auditUsers;
 
     /**
+     * 审核人员名字，多个用,分割
+     */
+    private String auditUserNames;
+
+    /**
      * 填报角色名称,多个用,分割
      */
     @ApiModelProperty("填报对象，多个用,分割")

src/main/java/com/keymobile/indicators/model/mapper/indicators/TaskMapper.java

@@ -58,5 +58,17 @@ public interface TaskMapper extends BaseMapper<Task> {
      */
     List<Task> findAllTask(QueryAllTaskParam param);
 
+    /**
+     * 根据审批状态统计任务
+     * @param param
+     * @return
+     */
     List<TaskStatusCountResult> countTask(QueryTaskParam param);
+
+    /**
+     * 根据id获取任务
+     * @param taskId
+     * @return
+     */
+    Task getById(String taskId);
 }

src/main/java/com/keymobile/indicators/service/SystemAuthService.java

@@ -24,12 +24,12 @@ public interface SystemAuthService {
      * @return
      */
     @GetMapping("/user/list")
-    List<JSONObject> findUserList(@RequestParam(value = "roleId", required = false) String roleId,
-                                     @RequestParam(value = "filter")boolean filter,
-                                     @RequestParam(value = "userId", required = false)String userId,
-                                     @RequestParam(value = "orgNo", required = false)String orgNo,
-                                     @RequestParam(value = "disname", required = false)String disname,
-                                     @RequestParam(value = "page")int page, @RequestParam(value = "size")int size);
+    JSONObject findUserList(@RequestParam(value = "roleId", required = false) String roleId,
+                            @RequestParam(value = "filter")boolean filter,
+                            @RequestParam(value = "userId", required = false)String userId,
+                            @RequestParam(value = "orgNo", required = false)String orgNo,
+                            @RequestParam(value = "disname", required = false)String disname,
+                            @RequestParam(value = "page")int page, @RequestParam(value = "size")int size);
 
     /**
      * 根据角色id列表获取角色列表
@@ -40,11 +40,11 @@ public interface SystemAuthService {
     List<JSONObject> getRolesByIds(@RequestParam("roleIds")List<String> roleIds);
 
     /**
-     * 根据机构id列表获取角色列表
-     * @param orgIds
+     * 根据机构编号列表获取角色列表
+     * @param nos
      * @return
      */
-    @GetMapping("/org/getByIds")
-    List<JSONObject> getOrgByIds(@RequestParam("orgIds")List<String> orgIds);
+    @GetMapping("/org/getByNos")
+    List<JSONObject> getOrgByNos(@RequestParam("nos")List<String> nos);
 
 }

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

@@ -121,7 +121,7 @@ public interface TaskService {
      * @param taskId
      * @param userId 提交人id
      */
-    void submitTask(String taskId, String userId);
+    Result submitTask(String taskId, String userId);
 
     /**
      * 审批任务

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

@@ -3,6 +3,12 @@
 <mapper namespace="com.keymobile.indicators.model.mapper.indicators.TaskMapper">
     
 
+    <select id="getById" resultType="com.keymobile.indicators.model.entity.dataenter.Task">
+        select *
+        from data_enter_task
+        where id = #{taskId}
+    </select>
+
 	<select id="getByRuleIdAndValueTime" parameterType="java.lang.Object"
             resultType="com.keymobile.indicators.model.entity.dataenter.Task" >
         select * 
@@ -52,6 +58,10 @@
         <if test="ruleLevel != null and ruleLevel !=''">
             and rule_level = #{ruleLevel}
         </if>
+        <if test="refIndDept != null and refIndDept !=''">
+            and ref_ind_dept = #{refIndDept}
+        </if>
+
         <if test="userId != null">
             <choose>
                 <when test="queryType == 1">