修改任务单位和任务创建功能

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

@@ -35,7 +35,7 @@ public class TaskRuleGroupObjCtrl {
         Date now = new Date();
         String userId = SystemUserUtil.getCurrentUserId();
         TaskRuleGroupObj nt =
-                taskRuleGroupObjService.getByName(obj.getRuleType(), obj.getRuleLevel(), obj.getName());
+                taskRuleGroupObjService.getByName(obj.getRuleType(), obj.getRuleLevel(), obj.getOrgNo(), obj.getName());
         if (nt != null && !nt.getId().equals(obj.getId())) {
             return Result.genFailedResult("同名任务单位已经存在");
         }
@@ -71,8 +71,10 @@ public class TaskRuleGroupObjCtrl {
     @PostMapping("find")
     public Page<TaskRuleGroupObj> find(@ApiParam("规则类型：1 省级 2 市级 3 县级")
                                        @RequestParam(value = "ruleType", defaultValue = "1", required = false) Integer ruleType,
-                                       @ApiParam("任务层级：省对市、省对县、市对县")
-                                       @RequestParam(value = "ruleLevel", required = false) String ruleLevel,
+                                       @ApiParam("任务层级：根据ruleType去获取")
+                                           @RequestParam(value = "ruleLevel", required = false) String ruleLevel,
+                                       @ApiParam("组织架构编号")
+                                           @RequestParam(value = "orgNo", required = false) String orgNo,
                                        @ApiParam("数据对象类型：1、组织机构 2、人员 3、岗位")
                                        @RequestParam(value = "objType", required = false) Integer objType,
                                        @ApiParam("搜索关键字（名字）")@RequestParam(value = "keyword", required=false) String keyword,
@@ -80,11 +82,11 @@ public class TaskRuleGroupObjCtrl {
                                        @ApiParam("每页条数")
                                        @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
         ruleType = null;
-        long total = taskRuleGroupObjService.findCount(ruleType, ruleLevel, objType, keyword);
+        long total = taskRuleGroupObjService.findCount(ruleType, ruleLevel, orgNo, objType, keyword);
         PageRequest request = PageRequest.of(page - 1, pageSize);
         List<TaskRuleGroupObj> list = new ArrayList<>();
         if (total > 0) {
-            list = taskRuleGroupObjService.find(ruleType, ruleLevel, objType, keyword, request.getOffset(), pageSize);
+            list = taskRuleGroupObjService.find(ruleType, ruleLevel, orgNo, objType, keyword, request.getOffset(), pageSize);
         }
         Page<TaskRuleGroupObj> pageResult = new PageImpl<>(list, request, total);
         return pageResult;

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

@@ -46,9 +46,15 @@ public class ExcelTemplate extends BaseModel {
     private Integer ruleType;
 
     /**
-     * 任务级别：省对市  省对县 市对县
+     * 所属组织机构
      */
-    @ApiModelProperty("任务级别：省对市  省对县 市对县")
+    @ApiModelProperty("所属组织机构")
+    private String orgNo;
+
+    /**
+     * 任务级别,根据ruleType从配置项获取
+     */
+    @ApiModelProperty("任务级别,根据ruleType从配置项获取")
     private String ruleLevel;
 
     /**

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

@@ -13,9 +13,15 @@ public class QueryAllTaskParam {
     @ApiModelProperty("规则类型：1 省级 2 市级 3 县级")
     private Integer ruleType;
     /**
-     * 任务级别：省对市  省对县 市对县
+     * 所属组织机构
      */
-    @ApiModelProperty("任务级别：省对市  省对县 市对县")
+    @ApiModelProperty("所属组织机构")
+    private String orgNo;
+
+    /**
+     * 任务级别,根据ruleType从配置项获取
+     */
+    @ApiModelProperty("任务级别,根据ruleType从配置项获取")
     private String ruleLevel;
 
     /**

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

@@ -14,9 +14,15 @@ public class QueryTaskParam {
     private Integer ruleType;
 
     /**
-     * 任务级别：省对市  省对县 市对县
+     * 所属组织机构
      */
-    @ApiModelProperty("任务级别：省对市  省对县 市对县")
+    @ApiModelProperty("所属组织机构")
+    private String orgNo;
+
+    /**
+     * 任务级别,根据ruleType从配置项获取
+     */
+    @ApiModelProperty("任务级别,根据ruleType从配置项获取")
     private String ruleLevel;
     /**
      * 查询类型：1 查找填报人任务 2 查找审核人任务 3 查找全部

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

@@ -46,9 +46,15 @@ public class Task extends BaseModel {
     private Integer ruleType;
 
     /**
-     * 任务级别：省对市  省对县 市对县
+     * 所属组织机构
      */
-    @ApiModelProperty("任务级别：省对市  省对县 市对县")
+    @ApiModelProperty("所属组织机构")
+    private String orgNo;
+
+    /**
+     * 任务级别,根据ruleType从配置项获取
+     */
+    @ApiModelProperty("任务级别,根据ruleType从配置项获取")
     private String ruleLevel;
 
     /**

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

@@ -34,10 +34,17 @@ public class TaskRule extends BaseModel {
     private Integer ruleType;
 
     /**
-     * 任务级别：省对市  省对县 市对县
+     * 所属组织机构
      */
-    @ApiModelProperty(value = "任务级别：省对市  省对县 市对县", required = true)
+    @ApiModelProperty("所属组织机构")
+    private String orgNo;
+
+    /**
+     * 任务级别,根据ruleType从配置项获取
+     */
+    @ApiModelProperty("任务级别,根据ruleType从配置项获取")
     private String ruleLevel;
+
     /**
      * 触发类型：1、手动 2、定时
      */
@@ -108,15 +115,5 @@ public class TaskRule extends BaseModel {
      */
     @Transient
     private List<TaskRuleIndicator> indicators;
-    /**
-     * 接收机构编号
-     * */
-
-    private String orgNo;
 
-    /**
-     * 增加判断是否是管理员
-     **/
-    @Transient
-    private Boolean sysAdmin;
 }

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

@@ -26,9 +26,15 @@ public class TaskRuleGroupObj extends BaseModel {
     private Integer ruleType;
 
     /**
-     * 任务级别：省对市  省对县 市对县
+     * 所属组织机构
      */
-    @ApiModelProperty("任务级别：省对市  省对县 市对县")
+    @ApiModelProperty("所属组织机构")
+    private String orgNo;
+
+    /**
+     * 任务级别,根据ruleType从配置项获取
+     */
+    @ApiModelProperty("任务级别,根据ruleType从配置项获取")
     private String ruleLevel;
 
     @ApiModelProperty("数据对象类型：1、组织机构 2、人员 3、岗位")

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

@@ -37,6 +37,7 @@ public interface TaskRuleObjMapper extends BaseMapper<TaskRuleGroupObj> {
      * 查找任务单位列表
      * @param ruleType
      * @param ruleLevel
+     * @param orgNo
      * @param objType
      * @param keyword 模糊查找名字关键字
      * @param start 从哪开始
@@ -44,6 +45,7 @@ public interface TaskRuleObjMapper extends BaseMapper<TaskRuleGroupObj> {
      * @return
      */
     List<TaskRuleGroupObj> find(@Param("ruleType") Integer ruleType, @Param("ruleLevel")String ruleLevel,
+                                @Param("orgNo")String orgNo,
                                 @Param("objType")Integer objType,
                                 @Param("keyword")String keyword,
                                 @Param("start")long start,
@@ -53,14 +55,24 @@ public interface TaskRuleObjMapper extends BaseMapper<TaskRuleGroupObj> {
      * 查找任务单位列表总数
      * @param ruleType
      * @param ruleLevel
+     * @param orgNo
      * @param objType
      * @param keyword
      * @return
      */
     long findCount(@Param("ruleType") Integer ruleType, @Param("ruleLevel")String ruleLevel,
+                   @Param("orgNo")String orgNo,
                    @Param("objType")Integer objType,
                    @Param("keyword")String keyword);
 
+    /**
+     * 根据名字查找
+     * @param ruleType
+     * @param ruleLevel
+     * @param orgNo
+     * @param name
+     * @return
+     */
     TaskRuleGroupObj findByName(@Param("ruleType") Integer ruleType, @Param("ruleLevel")String ruleLevel,
-              @Param("name")String name);
+                                @Param("orgNo")String orgNo, @Param("name")String name);
 }

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

@@ -26,10 +26,11 @@ public interface TaskRuleGroupObjService {
      * 根据ruleType、ruleLevel、objType和name获取获取任务单位
      * @param ruleType
      * @param ruleLevel
+     * @param orgNo
      * @param name
      * @return
      */
-    TaskRuleGroupObj getByName(Integer ruleType, String ruleLevel,
+    TaskRuleGroupObj getByName(Integer ruleType, String ruleLevel,String orgNo,
                                String name);
 
     /**
@@ -42,24 +43,26 @@ public interface TaskRuleGroupObjService {
      * 查找任务单位列表
      * @param ruleType
      * @param ruleLevel
+     * @param orgNo
      * @param objType
      * @param keyword 模糊查找名字关键字
      * @param start 从哪开始
      * @param size 取多少条
      * @return
      */
-    List<TaskRuleGroupObj> find(Integer ruleType, String ruleLevel, Integer objType,
+    List<TaskRuleGroupObj> find(Integer ruleType, String ruleLevel, String orgNo, Integer objType,
                                 String keyword, long start, int size);
 
     /**
      * 查找任务单位列表总数
      * @param ruleType
      * @param ruleLevel
+     * @param orgNo
      * @param objType
      * @param keyword
      * @return
      */
-    long findCount(Integer ruleType, String ruleLevel, Integer objType,
+    long findCount(Integer ruleType, String ruleLevel, String orgNo, Integer objType,
          String keyword);
 
 }

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

@@ -29,8 +29,8 @@ public class TaskRuleGroupObjServiceImpl implements TaskRuleGroupObjService {
     }
 
     @Override
-    public TaskRuleGroupObj getByName(Integer ruleType, String ruleLevel, String name) {
-        return taskRuleObjMapper.findByName(ruleType, ruleLevel, name);
+    public TaskRuleGroupObj getByName(Integer ruleType, String ruleLevel, String name,String orgNo) {
+        return taskRuleObjMapper.findByName(ruleType, ruleLevel,orgNo, name);
     }
 
     @Override
@@ -39,12 +39,12 @@ public class TaskRuleGroupObjServiceImpl implements TaskRuleGroupObjService {
     }
 
     @Override
-    public List<TaskRuleGroupObj> find(Integer ruleType, String ruleLevel, Integer objType, String keyword, long start, int size) {
-        return taskRuleObjMapper.find(ruleType, ruleLevel, objType, keyword, start, size);
+    public List<TaskRuleGroupObj> find(Integer ruleType, String ruleLevel,String orgNo, Integer objType, String keyword, long start, int size) {
+        return taskRuleObjMapper.find(ruleType, ruleLevel, orgNo, objType, keyword, start, size);
     }
 
     @Override
-    public long findCount(Integer ruleType, String ruleLevel, Integer objType, String keyword) {
-        return taskRuleObjMapper.findCount(ruleType, ruleLevel, objType, keyword);
+    public long findCount(Integer ruleType, String ruleLevel,String orgNo, Integer objType, String keyword) {
+        return taskRuleObjMapper.findCount(ruleType, ruleLevel, orgNo, objType, keyword);
     }
 }

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

@@ -682,6 +682,7 @@ public class TaskServiceImpl implements TaskService {
                                         task.setRuleName(rule.getName());
                                         task.setRuleType(rule.getRuleType());
                                         task.setRuleId(rule.getId());
+                                        task.setOrgNo(rule.getOrgNo());
                                         task.setRuleLevel(rule.getRuleLevel());
                                         task.setGroupId(rule.getGroupId());
                                         task.setRefIndDept(dept);

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

@@ -58,6 +58,9 @@
         <if test="ruleLevel != null and ruleLevel !=''">
             and rule_level = #{ruleLevel}
         </if>
+        <if test="orgNo != null and orgNo !=''">
+            and org_no = #{orgNo}
+        </if>
         <if test="refIndDept != null and refIndDept !=''">
             and ref_ind_dept = #{refIndDept}
         </if>

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

@@ -45,6 +45,9 @@
         <if test="ruleType != null">
             and rule_type = #{ruleType}
         </if>
+        <if test="orgNo != null and orgNo != ''">
+            and org_no = #{orgNo}
+        </if>
         <if test="ruleLevel != null and ruleLevel != ''">
             and rule_level = #{ruleLevel}
         </if>