修改任务规则和填报任务增加属性

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

@@ -4,6 +4,7 @@ import com.keymobile.indicators.constant.Constants;
 import com.keymobile.indicators.model.entity.dataenter.*;
 import com.keymobile.indicators.result.Result;
 import com.keymobile.indicators.service.dataenter.ExcelTemplateService;
+import com.keymobile.indicators.service.dataenter.TaskRuleGroupObjService;
 import com.keymobile.indicators.service.dataenter.TaskService;
 import com.keymobile.indicators.utils.DateUtils;
 import com.keymobile.indicators.utils.ExcelUtil;
@@ -40,6 +41,9 @@ public class DataEnterCtrl {
     @Autowired
     private ExcelTemplateService excelTemplateService;
 
+    @Autowired
+    private TaskRuleGroupObjService taskRuleGroupObjService;
+
     @ApiOperation("获取需要在线填报的数据项")
     @GetMapping("findToEdit")
     public List<TaskIndValue> findToEdit(@RequestParam("taskId") String taskId) {
@@ -50,6 +54,8 @@ public class DataEnterCtrl {
         String orgName = SystemUserUtil.getCurrentUserOrgName();
         List<TaskIndicator> taskIndicators = task.getIndicators();
         if (CollectionUtils.isNotEmpty(taskIndicators)) {
+            TaskRuleGroupObj groupObj = taskRuleGroupObjService.getById(task.getGroupId());
+
             List<TaskIndValue> oldValues = taskService.findValues(taskId, Constants.INPUT_ONLINE);
             if (CollectionUtils.isEmpty(oldValues)) {
                 //新增

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

@@ -29,7 +29,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-@Api(tags={"数据填报-填报任务管理"})
+@Api(tags={"数据填报-填报任务管理（任务清单、数据填报、数据审核）"})
 @RestController
 @RequestMapping(value = "/task")
 public class TaskCtrl  {
@@ -123,8 +123,10 @@ public class TaskCtrl  {
                                     task.setAuditEndDate(auditEndDate);
                                     task.setRuleName(rule.getName());
                                     task.setRuleType(rule.getRuleType());
-                                    task.setDescription(rule.getDescription());
                                     task.setRuleId(rule.getId());
+                                    task.setRuleLevel(rule.getRuleLevel());
+                                    task.setGroupId(rule.getGroupId());
+                                    task.setDescription(rule.getDescription());
                                     StringBuilder userNames = new StringBuilder(Constants.SEP_COMMA);
                                     StringBuilder userIds = new StringBuilder(Constants.SEP_COMMA);
                                     for (RoleRefUserModel um : refUsers) {
@@ -137,6 +139,8 @@ public class TaskCtrl  {
                                     task.setEnterUserNames(userNames.toString());
                                 }
                                 taskService.createTaskByRule(allTasks, valueTime, ruleId);
+                                rule.setLastActiveTime(now);
+                                taskRuleService.updateRule(rule);
                             }
                         } else {
                             result = Result.genFailedResult("规则配置的指标没有可用的数据项");
@@ -197,7 +201,7 @@ public class TaskCtrl  {
         return taskService.findTask(param);
     }
 
-    @ApiOperation("获取我的任务")
+    @ApiOperation("获取我的任务(数据填报、数据审核)")
     @PostMapping("findMyTask")
     public List<Task> findMyTask(@RequestBody QueryAllTaskParam param) {
         param.setUserId(SystemUserUtil.getCurrentUserId());

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

@@ -26,7 +26,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
-@Api(tags={"数据填报-任务规则管理"})
+@Api(tags={"数据填报-任务规则管理(任务下发)"})
 @RestController
 @RequestMapping(value = "/taskRule")
 @Slf4j
@@ -45,11 +45,13 @@ public class TaskRuleCtrl {
     @GetMapping("findByPage")
     public Page<TaskRule> findByPage(@ApiParam("规则类型：1 省级 2 市级 3 县级")
                                          @RequestParam(value = "ruleType", defaultValue = "1") int ruleType,
+                                     @ApiParam("任务层级：省对市、省对县、市对县")
+                                     @RequestParam(value = "ruleLevel", required = false) String ruleLevel,
                                      @ApiParam("搜索关键字（名字）")@RequestParam(value = "keyword", required=false) String keyword,
                                      @ApiParam("页码，从1开始") @RequestParam(value ="page",defaultValue = "1") int page,
                                      @ApiParam("每页条数")
                                          @RequestParam(value ="pageSize", defaultValue = "10") int pageSize) {
-        return taskRuleService.findRuleByPage(ruleType, keyword, page, pageSize);
+        return taskRuleService.findRuleByPage(ruleType, ruleLevel, keyword, page, pageSize);
     }
 
     @ApiOperation("根据id获取任务规则")

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

+package com.keymobile.indicators.api.hytobacco;
+
+import com.keymobile.indicators.model.entity.dataenter.TaskRuleGroupObj;
+import com.keymobile.indicators.result.Result;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags={"数据填报-任务单位管理"})
+@RestController
+@RequestMapping(value = "/taskRuleGroupObj")
+@Slf4j
+public class TaskRuleGroupObjCtrl {
+
+
+    public Result save(TaskRuleGroupObj obj) {
+            return Result.genOkResult();
+    }
+
+
+}

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

@@ -57,6 +57,11 @@ public class Task extends BaseModel {
     private String ruleName;
 
     /**
+     * 任务单位id
+     */
+    private Integer groupId;
+
+    /**
      * 数据时间,例如2019-03
      */
     private String valueTime;

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

@@ -22,7 +22,7 @@ public class TaskRule extends BaseModel {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Integer id;
 
-    @ApiModelProperty("规则名称")
+    @ApiModelProperty(value = "规则名称", required = true)
     private String name;
 
     @ApiModelProperty("规则描述")
@@ -31,18 +31,18 @@ public class TaskRule extends BaseModel {
     /**
      * 任务规则所属类型：1、省  2、市 3、县
      */
-    @ApiModelProperty("任务规则类型")
+    @ApiModelProperty(value = "任务规则类型", required = true)
     private Integer ruleType;
 
     /**
      * 任务级别：省对市  省对县 市对县
      */
-    @ApiModelProperty("任务级别：省对市  省对县 市对县")
+    @ApiModelProperty(value = "任务级别：省对市  省对县 市对县", required = true)
     private String ruleLevel;
     /**
      * 触发类型：1、手动 2、定时
      */
-    @ApiModelProperty("规则触发类型：1 、手动  2、定时")
+    @ApiModelProperty(value = "规则触发类型：1 、手动  2、定时", required = true)
     private Integer activeType;
 
     /**
@@ -72,17 +72,17 @@ public class TaskRule extends BaseModel {
     /**
      * 填报时限:天
      */
-    @ApiModelProperty("填报时限,多少天内填完， > 0")
+    @ApiModelProperty(value = "填报时限,多少天内填完， > 0", required = true)
     private Integer timeLimit;
 
-    @ApiModelProperty("审核时限,填完后多少天审核完， >= 0")
+    @ApiModelProperty(value = "审核时限,填完后多少天审核完， >= 0", required = true)
     private Integer auditLimit;
 
     @ApiModelProperty("上报时限,填完后多少天上报完， >= 0")
     private Integer submitLimit;
 
-    @ApiModelProperty("任务单位id")
-    private String groupId;
+    @ApiModelProperty(value = "任务单位id", required = true)
+    private Integer groupId;
 
     @Transient
     @ApiModelProperty("任务单位名称")
@@ -90,7 +90,7 @@ public class TaskRule extends BaseModel {
     /**
      * 填报角色id,多个用,分割
      */
-    @ApiModelProperty("填报对象，多个用,分割")
+    @ApiModelProperty(value = "填报对象，多个用,分割", required = true)
     private String toRoleIds;
 
     /**

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

@@ -27,19 +27,21 @@ public interface TaskRuleMapper extends BaseMapper<TaskRule> {
     /**
      * 分页查询填报任务规则
      * @param ruleType
+     * @param ruleLevel
      * @param keyword
      * @param start
      * @param pageSize
      * @return
      */
-    List<TaskRule> findRuleByPage(@Param("ruleType") Integer ruleType, @Param("keyword") String keyword,
+    List<TaskRule> findRuleByPage(@Param("ruleType") Integer ruleType, @Param("ruleLevel") String ruleLevel, @Param("keyword") String keyword,
                                   @Param("start") long start, @Param("pageSize") int pageSize);
 
     /**
      * 查询填报任务规则总数
      * @param ruleType
+     * @param ruleLevel
      * @param keyword
      * @return
      */
-    long findRuleCount(@Param("ruleType") Integer ruleType, @Param("keyword") String keyword);
+    long findRuleCount(@Param("ruleType") Integer ruleType, @Param("ruleLevel") String ruleLevel, @Param("keyword") String keyword);
 }

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

@@ -3,6 +3,7 @@ package com.keymobile.indicators.model.mapper.indicators;
 import com.keymobile.indicators.model.entity.dataenter.TaskRuleGroupObj;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import scala.Int;
 import tk.mybatis.mapper.common.BaseMapper;
 
 import java.util.List;
@@ -10,6 +11,53 @@ import java.util.List;
 @Mapper
 public interface TaskRuleObjMapper extends BaseMapper<TaskRuleGroupObj> {
 
+    /**
+     * 根据规则类型、规则层级查找任务单位
+     * @param ruleType
+     * @param ruleLevel
+     * @return
+     */
     List<TaskRuleGroupObj> findAllByRuleType(@Param("ruleType") Integer ruleType,
                                              @Param("ruleLevel") String ruleLevel);
+
+    /**
+     * 根据id查找
+     * @param id
+     * @return
+     */
+    TaskRuleGroupObj getById(Integer id);
+
+    /**
+     * 根据id逻辑删除
+     * @param id
+     */
+    void deleteById(Integer id);
+
+    /**
+     * 查找任务单位列表
+     * @param ruleType
+     * @param ruleLevel
+     * @param objType
+     * @param keyword 模糊查找名字关键字
+     * @param start 从哪开始
+     * @param size 取多少条
+     * @return
+     */
+    List<TaskRuleGroupObj> find(@Param("ruleType") Integer ruleType, @Param("ruleLevel")String ruleLevel,
+                                @Param("objType")Integer objType,
+                                @Param("keyword")String keyword,
+                                @Param("start")int start,
+                                @Param("size")int size);
+
+    /**
+     * 查找任务单位列表总数
+     * @param ruleType
+     * @param ruleLevel
+     * @param objType
+     * @param keyword
+     * @return
+     */
+    long findCount(@Param("ruleType") Integer ruleType, @Param("ruleLevel")String ruleLevel,
+                   @Param("objType")Integer objType,
+                   @Param("keyword")String keyword);
 }

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

+package com.keymobile.indicators.service.dataenter;
+
+import com.keymobile.indicators.model.entity.dataenter.TaskRuleGroupObj;
+
+import java.util.List;
+
+/**
+ * 任务单位服务接口
+ */
+public interface TaskRuleGroupObjService {
+
+    /**
+     * 保存任务单位
+     * @return
+     */
+    Integer save(TaskRuleGroupObj obj);
+
+    /**
+     * 根据id获取任务单位
+     * @param id
+     * @return
+     */
+    TaskRuleGroupObj getById(Integer id);
+
+    /**
+     * 根据id删除任务单位定义（逻辑删除）
+     * @param id
+     */
+    void deleteById(Integer id);
+
+    /**
+     * 查找任务单位列表
+     * @param ruleType
+     * @param ruleLevel
+     * @param objType
+     * @param keyword 模糊查找名字关键字
+     * @param start 从哪开始
+     * @param size 取多少条
+     * @return
+     */
+    List<TaskRuleGroupObj> find(Integer ruleType, String ruleLevel, Integer objType,
+                                String keyword, int start, int size);
+
+    /**
+     * 查找任务单位列表总数
+     * @param ruleType
+     * @param ruleLevel
+     * @param objType
+     * @param keyword
+     * @return
+     */
+    long findCount(Integer ruleType, String ruleLevel, Integer objType,
+         String keyword);
+
+}

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

@@ -47,12 +47,13 @@ public interface TaskRuleService {
     /**
      * 根据规则类型、关键字分页查找规则
      * @param ruleType
+     * @param ruleLevel
      * @param keyword
      * @param page
      * @param pageSize
      * @return
      */
-    Page<TaskRule> findRuleByPage(Integer ruleType, String keyword, int page, int pageSize);
+    Page<TaskRule> findRuleByPage(Integer ruleType, String ruleLevel, String keyword, int page, int pageSize);
 
     /**
      * 规则类型

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

+package com.keymobile.indicators.service.dataenter.impl;
+
+import com.keymobile.indicators.model.entity.dataenter.TaskRuleGroupObj;
+import com.keymobile.indicators.model.mapper.indicators.TaskRuleObjMapper;
+import com.keymobile.indicators.service.dataenter.TaskRuleGroupObjService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class TaskRuleGroupObjServiceImpl implements TaskRuleGroupObjService {
+    @Autowired
+    private TaskRuleObjMapper taskRuleObjMapper;
+
+    @Override
+    public Integer save(TaskRuleGroupObj obj) {
+        if (obj.getId() == null || obj.getId() == 0) {
+            taskRuleObjMapper.insert(obj);
+        } else {
+            taskRuleObjMapper.updateByPrimaryKey(obj);
+        }
+        return obj.getId();
+    }
+
+    @Override
+    public TaskRuleGroupObj getById(Integer id) {
+        return taskRuleObjMapper.getById(id);
+    }
+
+    @Override
+    public void deleteById(Integer id) {
+        taskRuleObjMapper.deleteById(id);
+    }
+
+    @Override
+    public List<TaskRuleGroupObj> find(Integer ruleType, String ruleLevel, Integer objType, String keyword, int start, int size) {
+        return taskRuleObjMapper.find(ruleType, ruleLevel, objType, keyword, start, size);
+    }
+
+    @Override
+    public long findCount(Integer ruleType, String ruleLevel, Integer objType, String keyword) {
+        return taskRuleObjMapper.findCount(ruleType, ruleLevel, objType, keyword);
+    }
+}

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

@@ -10,6 +10,7 @@ import com.keymobile.indicators.model.mapper.indicators.TaskRuleObjMapper;
 import com.keymobile.indicators.service.dataenter.TaskRuleService;
 import com.keymobile.indicators.service.dataenter.TaskService;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -32,10 +33,6 @@ public class TaskRuleServiceImpl implements TaskRuleService {
     @Autowired
     private TaskRuleObjMapper taskRuleObjMapper;
 
-    @Autowired
-    private TaskService taskService;
-
-
     @Override
     public void delete(Integer ruleId) {
         taskRuleMapper.deleteById(ruleId);
@@ -92,12 +89,12 @@ public class TaskRuleServiceImpl implements TaskRuleService {
     }
 
     @Override
-    public Page<TaskRule> findRuleByPage(Integer ruleType, String keyword, int page, int pageSize) {
-        long total = taskRuleMapper.findRuleCount(ruleType, keyword);
+    public Page<TaskRule> findRuleByPage(Integer ruleType, String ruleLevel, String keyword, int page, int pageSize) {
+        long total = taskRuleMapper.findRuleCount(ruleType, ruleLevel, keyword);
         PageRequest request = PageRequest.of(page - 1, pageSize);
         List<TaskRule> list = new ArrayList<>();
         if (total > 0) {
-           list = taskRuleMapper.findRuleByPage(ruleType, keyword, request.getOffset(), pageSize);
+           list = taskRuleMapper.findRuleByPage(ruleType, ruleLevel, keyword, request.getOffset(), pageSize);
         }
         Page<TaskRule> pageResult = new PageImpl<TaskRule>(list, request, total);
         return pageResult;

src/main/resources/bootstrap.yml

@@ -2,7 +2,7 @@ spring:
   application:
     name: indicators
   profiles:
-    active: test
+    active: dev
   cloud:
     config:
       uri: http://localhost:8082
\ No newline at end of file

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

@@ -13,4 +13,46 @@
         </if>
         order by update_time desc
     </select>
+    
+    <update id="deleteById" parameterType="java.lang.Integer">
+        update data_enter_rule_obj
+        set state = 3
+        where id = #{id}
+    </update>
+    
+    <select id="getById" parameterType="java.lang.Integer" resultType="com.keymobile.indicators.model.entity.dataenter.TaskRuleGroupObj">
+        select * 
+        from data_enter_rule_obj
+        where id = #{id}
+    </select>
+    
+    <select id="find" resultType="com.keymobile.indicators.model.entity.dataenter.TaskRuleGroupObj">
+        select *
+        from data_enter_rule_obj
+        <include refid="findWhereSql"></include>
+        order by update_time desc
+        limit #{start}, #{size}
+    </select>
+
+    <select id="findCount" resultType="long">
+        select count(i)
+        from data_enter_rule_obj
+        <include refid="findWhereSql"></include>
+    </select>
+
+    <sql id="findWhereSql">
+        where state = 1
+        <if test="ruleType != null">
+            and rule_type = #{ruleType}
+        </if>
+        <if test="ruleLevel != null and ruleLevel != ''">
+            and rule_level = #{ruleLevel}
+        </if>
+        <if test="objType != null">
+            and obj_type = #{objType}
+        </if>
+        <if test="keyword != null and keyword != ''">
+            and name like concat('%', keyword, '%')
+        </if>
+    </sql>
 </mapper>