填报任务业务规则实现

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

 package com.keymobile.indicators.api.hytobacco;
 
+import com.keymobile.indicators.model.entity.dataenter.QueryTaskParam;
 import com.keymobile.indicators.model.entity.dataenter.Task;
 import com.keymobile.indicators.model.entity.dataenter.TaskAssginParam;
 import com.keymobile.indicators.result.Result;
@@ -32,14 +33,9 @@ public class TaskCtrl  {
     }
 
     @ApiOperation("根据关键字、规则类型、用户获取相关的填报任务")
-    @GetMapping("findByPage")
-    public Page<Task> findByPage(@ApiParam(name = "规则类型：1 省级 2 市级 3 县级")@RequestParam(defaultValue = "1") int ruleType,
-                                         @ApiParam(name = "所属用户id")@RequestParam String userId,
-                                         @ApiParam(name = "搜索关键字（名字）")@RequestParam(required=false) String keyword,
-                                         @ApiParam(name = "页码，从1开始") @RequestParam(defaultValue = "0") int page,
-                                         @ApiParam(name = "每页条数") @RequestParam(defaultValue = "10") int pageSize) {
-        taskRuleService.findRuleByPage(ruleType, keyword, pageSize, page);
-        return null;
+    @PostMapping("findByPage")
+    public Page<Task> findByPage(@RequestBody QueryTaskParam param) {
+        return taskService.findTask(param);
     }
 
     @ApiOperation("根据id获取填报任务")

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

 package com.keymobile.indicators.api.hytobacco;
 
+import com.keymobile.indicators.constant.Constants;
 import com.keymobile.indicators.model.entity.dataenter.TaskRule;
 import com.keymobile.indicators.result.Result;
 import com.keymobile.indicators.service.dataenter.TaskRuleService;
+import com.keymobile.indicators.utils.SystemUserUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -10,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
+
 @Api(tags={"填报任务规则管理接口"})
 @RestController
 @RequestMapping(value = "/taskRule")
@@ -44,12 +48,24 @@ public class TaskRuleCtrl {
     @PostMapping("save")
     public Result save(@RequestBody TaskRule rule) {
         Result result = null;
+        TaskRule temp = taskRuleService.findRuleByName(rule.getRuleType(), rule.getName());
+        if (temp != null && !temp.getId().equals(rule.getId())) {
+            result = Result.genFailedResult("已经存在同名任务规则定义!");
+        } else {
+            Date now = new Date();
+            String currentUserId = SystemUserUtil.getCurrentUserId();
+            rule.setUpdater(currentUserId);
+            rule.setUpdateTime(now);
+            rule.setState(Constants.DATA_STATE_A);
             if (rule.getId() == null || rule.getId() == 0) {
+                rule.setCreateTime(now);
+                rule.setCreator(currentUserId);
                 taskRuleService.createRule(rule);
             } else {
                 taskRuleService.updateRule(rule);
             }
             result = Result.genOkResult();
+        }
         return result;
     }
 

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

@@ -6,6 +6,7 @@ import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Field;
 
+import javax.persistence.Table;
 import java.io.Serializable;
 
 /**
@@ -13,6 +14,7 @@ import java.io.Serializable;
  */
 @Data
 @Document(collection = "config_info")
+@Table(name="config_info")
 public class ConfigInfo extends BaseModel implements Serializable {
 
     /**

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

@@ -3,6 +3,8 @@ package com.keymobile.indicators.model.entity.dataenter;
 import com.keymobile.indicators.model.entity.BaseModel;
 import lombok.Data;
 
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
@@ -14,6 +16,7 @@ import javax.persistence.Table;
 public class ExcelIndicator extends BaseModel {
 
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Integer id;
 
     /**
@@ -37,6 +40,11 @@ public class ExcelIndicator extends BaseModel {
     private String indName;
 
     /**
+     * 指标单位
+     */
+    private String indUnit;
+
+    /**
      * 指标数量来源：1 Excel导入 2 手工录入
      */
     private Integer indSource;

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

@@ -3,6 +3,8 @@ package com.keymobile.indicators.model.entity.dataenter;
 import com.keymobile.indicators.model.entity.BaseModel;
 import lombok.Data;
 
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
@@ -14,6 +16,7 @@ import javax.persistence.Table;
 public class ExcelObj extends BaseModel {
 
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Integer id;
 
     /**

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

+package com.keymobile.indicators.model.entity.dataenter;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("查询任务参数")
+@Data
+public class QueryTaskParam {
+    @ApiModelProperty(name = "规则类型：1 省级 2 市级 3 县级")
+    private Integer ruleType;
+
+    /**
+     * 查询类型：1 查找填报人任务 2 查找审核人任务 3 查找全部
+     */
+    private int queryType = 1;
+
+    @ApiModelProperty(name = "所属用户id")
+    private String userId;
+    @ApiModelProperty(name = "搜索关键字（名字）")
+    private String keyword;
+    @ApiModelProperty(name = "填报时间")
+    private String valueTime;
+    @ApiModelProperty(name = "任务状态：1、填报中 2、审批中 3、审核通过 4、驳回")
+    private Integer status;
+    @ApiModelProperty(name = "页码，从1开始")
+    private int page = 1;
+    @ApiModelProperty(name = "每页条数")
+    private int pageSize = 10;
+
+    /**
+     * 开始数
+     */
+    private long start = 0L;
+}

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

@@ -37,6 +37,11 @@ public class TaskIndValue extends BaseModel {
     private String indName;
 
     /**
+     * 指标单位
+     */
+    private String indUnit;
+
+    /**
      * 指标数量来源：1 Excel导入 2 手工录入
      */
     private Integer indSource;

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

@@ -37,6 +37,11 @@ public class TaskIndicator extends BaseModel {
     private String indName;
 
     /**
+     * 指标单位
+     */
+    private String indUnit;
+
+    /**
      * 指标数量来源：1 Excel导入 2 手工录入
      */
     private Integer indSource;

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

@@ -3,9 +3,7 @@ package com.keymobile.indicators.model.entity.dataenter;
 import com.keymobile.indicators.model.entity.BaseModel;
 import lombok.Data;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.util.Date;
 import java.util.List;
 
@@ -17,6 +15,7 @@ import java.util.List;
 public class TaskRule extends BaseModel {
 
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Integer id;
 
     private String name;
@@ -63,5 +62,5 @@ public class TaskRule extends BaseModel {
      * 关联的数据项
      */
     @Transient
-    private List<TaskIndicator> indicators;
+    private List<TaskRuleIndicator> indicators;
 }

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

@@ -3,6 +3,8 @@ package com.keymobile.indicators.model.entity.dataenter;
 import com.keymobile.indicators.model.entity.BaseModel;
 import lombok.Data;
 
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
@@ -14,12 +16,13 @@ import javax.persistence.Table;
 public class TaskRuleIndicator extends BaseModel {
 
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Integer id;
 
     /**
      * 规则id
      */
-    private String ruleId;
+    private Integer ruleId;
 
     /**
      * 指标id
@@ -32,6 +35,11 @@ public class TaskRuleIndicator extends BaseModel {
     private String indName;
 
     /**
+     * 指标单位
+     */
+    private String indUnit;
+
+    /**
      * 指标数量来源：1 Excel导入 2 手工录入
      */
     private Integer indSource;

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

+package com.keymobile.indicators.model.mapper.indicators;
+
+import com.keymobile.indicators.model.entity.ConfigInfo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import tk.mybatis.mapper.common.BaseMapper;
+
+import java.util.List;
+
+/**
+ * 配置项
+ */
+@Mapper
+public interface ConfigInfoMapper extends BaseMapper<ConfigInfo> {
+
+    /**
+     * 关键字搜索配置项
+     * @param keyword
+     * @param start
+     * @param pageSize
+     * @return
+     */
+    List<ConfigInfo> findConfigInfo(@Param("keyword") String keyword, @Param("start") long start, @Param("pageSize") int pageSize);
+
+    /**
+     * 关键字搜索配置项总数
+     * @param keyword
+     * @return
+     */
+    long findConfigInfoCount(@Param("keyword") String keyword);
+}

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

@@ -2,6 +2,7 @@ package com.keymobile.indicators.model.mapper.indicators;
 
 import com.keymobile.indicators.model.entity.dataenter.TaskIndicator;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.BaseMapper;
 
 import java.util.List;
@@ -16,6 +17,13 @@ public interface TaskIndicatorMapper extends BaseMapper<TaskIndicator> {
     void deleteByTaskId(String taskId);
 
     /**
+     * 根据规则id和取数时间删除任务数据项
+     * @param ruleId
+     * @param valueTime
+     */
+    void deleteByRuleIdAndValueTime(@Param("ruleId") Integer ruleId, @Param("valueTime") String valueTime);
+
+    /**
      * 根据任务获取关联的数据项
      * @param taskId
      * @return

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

 package com.keymobile.indicators.model.mapper.indicators;
 
+import com.keymobile.indicators.model.entity.dataenter.QueryTaskParam;
 import com.keymobile.indicators.model.entity.dataenter.Task;
-import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.BaseMapper;
@@ -15,9 +15,11 @@ public interface TaskMapper extends BaseMapper<Task> {
      * 根据任务规则id和取数时间获取任务
      * @param ruleId
      * @param valueTime
+     * @param includeChildren
      * @return
      */
-    List<Task> getByRuleIdAndValueTime(@Param("ruleId") Integer ruleId, @Param("valueTime") String valueTime);
+    List<Task> getByRuleIdAndValueTime(@Param("ruleId") Integer ruleId,
+                                       @Param("valueTime") String valueTime, @Param("includeChildren") boolean includeChildren);
 
     /**
      * 根据任务规则id和取数时间删除任务
@@ -25,4 +27,26 @@ public interface TaskMapper extends BaseMapper<Task> {
      * @param valueTime
      */
     void deleteByRuleIdAndValueTime(@Param("ruleId") Integer ruleId, @Param("valueTime") String valueTime);
+
+    /**
+     * 根据获取直属子任务
+     * @param parentId
+     * @return
+     */
+    List<Task> getChildren(@Param("parentId")String parentId);
+
+    /**
+     * 查找填报任务总数
+     * @param param
+     * @return
+     */
+    long findTaskCount(QueryTaskParam param);
+
+    /**
+     * 查找填报任务
+     * @param param
+     * @return
+     */
+    List<Task> findTask(QueryTaskParam param);
+
 }

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

@@ -19,6 +19,14 @@ public interface TaskRuleMapper extends BaseMapper<TaskRule> {
     void deleteById(Integer id);
 
     /**
+     * 根据类型和名字获取任务规则
+     * @param ruleType
+     * @param name
+     * @return
+     */
+    TaskRule findRuleByName(@Param("ruleType") Integer ruleType, @Param("name") String name);
+
+    /**
      * 分页查询填报任务规则
      * @param ruleType
      * @param keyword

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

@@ -22,6 +22,13 @@ public interface TaskRuleService {
     TaskRule getById(Integer ruleId);
 
     /**
+     * 根据名字获取规则
+     * @param name
+     * @return
+     */
+    TaskRule findRuleByName(Integer ruleType, String name);
+
+    /**
      * 创建规则
      * @param rule
      * @return

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

 package com.keymobile.indicators.service.dataenter;
 
+import com.keymobile.indicators.model.entity.dataenter.QueryTaskParam;
 import com.keymobile.indicators.model.entity.dataenter.Task;
 import org.springframework.data.domain.Page;
 
@@ -38,11 +39,11 @@ public interface TaskService {
 
 
     /**
-     * 根据规则id和取数时间删除任务
+     * 根据规则id和取数时间删除任务（物理删除）
      * @param ruleId
      * @param valueTime
      */
-    void deleteByRuleId(Integer ruleId, String valueTime);
+    void deleteByRuleIdAndValueTime(Integer ruleId, String valueTime);
 
     /**
      * 根据规则id和取数时间获取所有的任务
@@ -59,17 +60,11 @@ public interface TaskService {
     List<Task> getChildren(String parentId);
 
     /**
-     * 根据用户id 和 任务规则关键字分页获取任务
-     * @param userId
-     * @param keyword
-     * @param valueTime
-     * @param status
-     * @param pageSize
-     * @param start
+     * 根据条件分页查询任务
+     * @param param
      * @return
      */
-    Page<Task> findUserTask(String userId, String keyword, String valueTime, Integer status, int pageSize, int start);
-
+    Page<Task> findTask(QueryTaskParam param);
 
 
 }

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

 package com.keymobile.indicators.service.dataenter.impl;
 
+import com.keymobile.indicators.constant.Constants;
 import com.keymobile.indicators.model.entity.dataenter.TaskRule;
+import com.keymobile.indicators.model.entity.dataenter.TaskRuleIndicator;
 import com.keymobile.indicators.model.mapper.indicators.TaskRuleIndicatorMapper;
 import com.keymobile.indicators.model.mapper.indicators.TaskRuleMapper;
 import com.keymobile.indicators.service.dataenter.TaskRuleService;
 import com.keymobile.indicators.service.dataenter.TaskService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -31,21 +34,56 @@ public class TaskRuleServiceImpl implements TaskRuleService {
     @Override
     public void delete(Integer ruleId) {
         taskRuleMapper.deleteById(ruleId);
+        taskRuleIndicatorMapper.deleteByRuleId(ruleId);
     }
 
     @Override
     public TaskRule getById(Integer ruleId) {
-        return taskRuleMapper.selectByPrimaryKey(ruleId);
+        TaskRule rule = taskRuleMapper.selectByPrimaryKey(ruleId);
+        List<TaskRuleIndicator> indicators = taskRuleIndicatorMapper.getByRuleId(ruleId);
+        rule.setIndicators(indicators);
+        return rule;
     }
 
     @Override
+    public TaskRule findRuleByName(Integer ruleType, String name) {
+        return taskRuleMapper.findRuleByName(ruleType, name);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
     public void createRule(TaskRule rule) {
-        taskRuleMapper.createTaskRule(rule);
+        rule.setState(Constants.DATA_STATE_A);
+        taskRuleMapper.insert(rule);
+        saveRuleIndicators(rule);
+    }
+
+    /**
+     * 保存规则关联的数据项指标
+     * @param rule
+     */
+    private void saveRuleIndicators(TaskRule rule) {
+        List<TaskRuleIndicator> indicators = rule.getIndicators();
+        if (CollectionUtils.isNotEmpty(indicators)) {
+            for (TaskRuleIndicator indicator : indicators) {
+                indicator.setRuleId(rule.getId());
+                indicator.setState(Constants.DATA_STATE_A);
+                indicator.setCreateTime(rule.getUpdateTime());
+                indicator.setCreator(rule.getUpdater());
+                indicator.setUpdater(rule.getUpdater());
+                indicator.setUpdateTime(rule.getUpdateTime());
+                taskRuleIndicatorMapper.insert(indicator);
+            }
+        }
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void updateRule(TaskRule rule) {
+        rule.setState(Constants.DATA_STATE_A);
         taskRuleMapper.updateByPrimaryKey(rule);
+        taskRuleIndicatorMapper.deleteByRuleId(rule.getId());
+        saveRuleIndicators(rule);
     }
 
     @Override
@@ -61,10 +99,12 @@ public class TaskRuleServiceImpl implements TaskRuleService {
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void createTaskByRule(Integer ruleId, String valueTime) {
          // 先删除已有的任务
-        taskService.deleteByRuleId(ruleId, valueTime);
+        taskService.deleteByRuleIdAndValueTime(ruleId, valueTime);
+        TaskRule rule = getById(ruleId);
+        List<TaskRuleIndicator> ruleIndicators = rule.getIndicators();
     }
 
 

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

 package com.keymobile.indicators.service.dataenter.impl;
 
+import com.keymobile.indicators.constant.Constants;
+import com.keymobile.indicators.model.entity.dataenter.QueryTaskParam;
 import com.keymobile.indicators.model.entity.dataenter.Task;
+import com.keymobile.indicators.model.entity.dataenter.TaskIndicator;
 import com.keymobile.indicators.model.mapper.indicators.TaskIndicatorMapper;
 import com.keymobile.indicators.model.mapper.indicators.TaskMapper;
-import com.keymobile.indicators.model.mapper.indicators.TaskRuleIndicatorMapper;
 import com.keymobile.indicators.service.dataenter.TaskService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -21,42 +28,73 @@ public class TaskServiceImpl implements TaskService {
     private TaskIndicatorMapper taskIndicatorMapper;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Task createTask(Task task) {
-        return null;
+        taskMapper.insert(task);
+        List<TaskIndicator> indicators = task.getIndicators();
+        if (CollectionUtils.isNotEmpty(indicators)) {
+            for (TaskIndicator indicator : indicators) {
+                indicator.setState(Constants.DATA_STATE_A);
+                taskIndicatorMapper.insert(indicator);
+            }
+        }
+        return task;
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void updateTask(Task task) {
-
+        taskIndicatorMapper.deleteByTaskId(task.getId());
+        taskMapper.updateByPrimaryKey(task);
+        List<TaskIndicator> indicators = task.getIndicators();
+        if (CollectionUtils.isNotEmpty(indicators)) {
+            for (TaskIndicator indicator : indicators) {
+                indicator.setState(Constants.DATA_STATE_A);
+                taskIndicatorMapper.insert(indicator);
+            }
+        }
     }
 
     @Override
     public void delete(String taskId) {
-
+        taskMapper.deleteByPrimaryKey(taskId);
     }
 
     @Override
     public Task getById(String taskId) {
-        return null;
+        Task task = taskMapper.selectByPrimaryKey(taskId);
+        List<TaskIndicator> indicators = taskIndicatorMapper.getByTaskId(taskId);
+        task.setIndicators(indicators);
+        return task;
     }
 
     @Override
-    public void deleteByRuleId(Integer ruleId, String valueTime) {
-
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteByRuleIdAndValueTime(Integer ruleId, String valueTime) {
+        taskMapper.deleteByRuleIdAndValueTime(ruleId, valueTime);
+        taskIndicatorMapper.deleteByRuleIdAndValueTime(ruleId, valueTime);
     }
 
     @Override
     public List<Task> findByRuleAndValueTime(Integer ruleId, String valueTime, boolean includeChildren) {
-        return null;
+        return taskMapper.getByRuleIdAndValueTime(ruleId, valueTime, includeChildren);
     }
 
     @Override
     public List<Task> getChildren(String parentId) {
-        return null;
+        return taskMapper.getChildren(parentId);
     }
 
     @Override
-    public Page<Task> findUserTask(String userId, String keyword, String valueTime, Integer status, int pageSize, int start) {
-        return null;
+    public Page<Task> findTask(QueryTaskParam param) {
+        long total = taskMapper.findTaskCount(param);
+        PageRequest request = PageRequest.of(param.getPage() - 1, param.getPageSize());
+        List<Task> list = new ArrayList<>();
+        if (total > 0) {
+            param.setStart(request.getOffset());
+            list = taskMapper.findTask(param);
+        }
+        Page<Task> pageResult = new PageImpl<Task>(list, request, total);
+        return pageResult;
     }
 }

src/main/java/com/keymobile/indicators/service/impl/ConfigInfoServiceImpl.java

 package com.keymobile.indicators.service.impl;
 
 import com.keymobile.indicators.model.entity.ConfigInfo;
-import com.keymobile.indicators.persistence.hyindicators.ConfigInfoRepository;
+import com.keymobile.indicators.model.mapper.indicators.ConfigInfoMapper;
 import com.keymobile.indicators.service.ConfigInfoService;
 import com.keymobile.indicators.service.RedisCacheService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.ExampleMatcher;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.*;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 
 @Component
@@ -20,7 +19,7 @@ public class ConfigInfoServiceImpl implements ConfigInfoService {
     private static  final String CACHE_CONFIG_KEY_PRE = "cfg";
 
     @Autowired
-    private ConfigInfoRepository configInfoRepository;
+    private ConfigInfoMapper configInfoMapper;
 
     @Autowired
     private RedisCacheService redisCacheService;
@@ -29,9 +28,8 @@ public class ConfigInfoServiceImpl implements ConfigInfoService {
     public ConfigInfo getConfigInfoById(String id) {
         ConfigInfo info = (ConfigInfo)redisCacheService.get(CACHE_CONFIG_KEY_PRE + id);
         if (info == null) {
-            Optional<ConfigInfo> opt = configInfoRepository.findById(id);
-            if (opt.isPresent()) {
-                info = opt.get();
+            info = configInfoMapper.selectByPrimaryKey(id);
+            if (info != null) {
                 redisCacheService.add(CACHE_CONFIG_KEY_PRE + id, info);
             }
         }
@@ -40,34 +38,32 @@ public class ConfigInfoServiceImpl implements ConfigInfoService {
 
     @Override
     public ConfigInfo createConfigInfo(ConfigInfo config) {
-        return configInfoRepository.insert(config);
+         configInfoMapper.insert(config);
+         return config;
     }
 
     @Override
     public ConfigInfo updateInfo(ConfigInfo config) {
-        config = configInfoRepository.save(config);
+        configInfoMapper.updateByPrimaryKey(config);
         this.refreshCache();
         return config;
     }
 
     @Override
     public void deleteConfigById(String id) {
-        configInfoRepository.deleteById(id);
+        configInfoMapper.deleteByPrimaryKey(id);
         this.refreshCache();
     }
 
     @Override
     public Page<ConfigInfo> queryPageInfo(Pageable page, String keyword) {
-        if (StringUtils.isNotBlank(keyword)) {
-            ExampleMatcher exampleMatcher = ExampleMatcher.matching()
-                    .withMatcher("_id", ExampleMatcher.GenericPropertyMatchers.contains())
-                    .withMatcher("cf_desc", ExampleMatcher.GenericPropertyMatchers.contains())
-                    .withMatcher("cf_value", ExampleMatcher.GenericPropertyMatchers.contains());
-            ConfigInfo config = new ConfigInfo();
-            return configInfoRepository.findAll(Example.of(config, exampleMatcher), page);
-        } else {
-            return configInfoRepository.findAll(page);
+        long total = configInfoMapper.findConfigInfoCount(keyword);
+        List<ConfigInfo> list = new ArrayList<>();
+        if (total > 0) {
+            list = configInfoMapper.findConfigInfo(keyword, page.getOffset(), page.getPageSize());
         }
+        Page<ConfigInfo> pageResult = new PageImpl<>(list, page, total);
+        return pageResult;
     }
 
     @Override

src/main/java/com/keymobile/indicators/utils/SystemUserUtil.java

+package com.keymobile.indicators.utils;
+
+/**
+ * 获取当前登录用户信息
+ */
+public class SystemUserUtil {
+
+    /**
+     * 获取当前登录用户id
+     * @return
+     */
+    public static String getCurrentUserId() {
+        //TODO 待实现
+        return "1";
+    }
+
+}

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.keymobile.indicators.model.mapper.indicators.ConfigInfoMapper">
+
+	<select id="findConfigInfo" parameterType="java.lang.Object" resultType="com.keymobile.indicators.model.entity.ConfigInfo" >
+        select * 
+        from config_info
+        where state = 1
+        <if test="keyword != null and keyword != ''">
+            and id like concat('%', #{keyword}, '%')
+        </if>
+        order by update_time desc, id asc
+        limit #{start}, #{pageSize}
+    </select>
+    <select id="findConfigInfoCount" parameterType="java.lang.String" resultType="long" >
+        select count(id)
+        from config_info
+        where state = 1
+        <if test="keyword != null and keyword != ''">
+            and id like concat('%', #{keyword}, '%')
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file

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

@@ -10,9 +10,15 @@
     </select>
 
 
-    <update id="deleteByTaskId" parameterType="java.lang.Integer">
+    <update id="deleteByTaskId" parameterType="java.lang.String">
     	update data_enter_task_ind
     	set state = 3
     	where task_id = #{taskId}
     </update>
+
+    <update id="deleteByRuleIdAndValueTime" parameterType="java.lang.Object">
+    	update data_enter_task_ind
+    	set state = 3
+    	where rule_id = #{ruleId} and value_time = #{valueTime}
+    </update>
 </mapper>
\ No newline at end of file

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

@@ -3,16 +3,74 @@
 <mapper namespace="com.keymobile.indicators.model.mapper.indicators.TaskMapper">
     
 
-	<select id="getByRuleIdAndValueTime" parameterType="java.lang.Integer" resultType="com.keymobile.indicators.model.entity.dataenter.ExcelObj" >
+	<select id="getByRuleIdAndValueTime" parameterType="java.lang.Object"
+            resultType="com.keymobile.indicators.model.entity.dataenter.Task" >
         select * 
         from data_enter_task
-        where rule_id = #{ruleId} and value_time = #{valueTime}
+        where state = 1 and rule_id = #{ruleId} and value_time = #{valueTime}
+        <if test="includeChildren != null and !includeChildren">
+            and p_id is null
+        </if>
     </select>
 
+    <select id="getChildren" parameterType="java.lang.String"
+            resultType="com.keymobile.indicators.model.entity.dataenter.Task" >
+        select *
+        from data_enter_task
+        where state = 1 and p_id = #{parentId}
+    </select>
+
+    <select id="findTaskCount" parameterType="com.keymobile.indicators.model.entity.dataenter.QueryTaskParam"
+            resultType="long" >
+        select count(1)
+        from data_enter_task
+        <include refid="findTaskWhereSql"></include>
+    </select>
 
-    <delete id="deleteByRuleIdAndValueTime" parameterType="java.lang.Integer">
-    	delete 
+    <select id="findTask" parameterType="com.keymobile.indicators.model.entity.dataenter.QueryTaskParam"
+            resultType="com.keymobile.indicators.model.entity.dataenter.Task" >
+        select count(1)
         from data_enter_task
+        <include refid="findTaskWhereSql"></include>
+        order by status asc, value_time desc
+        limit #{start}, #{pageSize}
+    </select>
+
+    <sql id="findTaskWhereSql">
+        where state = 1
+        <if test="ruleType != null">
+            and rule_type = #{ruleType}
+        </if>
+        <if test="userId != null">
+            <choose>
+                <when test="queryType == 1">
+                    and enter_users like concat('%,', #{userId}, ',%')
+                </when>
+                <when test="queryType == 1">
+                    and audit_users like concat('%,', #{userId}, ',%')
+                </when>
+                <otherwise>
+                    and ( enter_users like concat('%,', #{userId}, ',%')
+                    or  audit_users like concat('%,', #{userId}, ',%')
+                    )
+                </otherwise>
+            </choose>
+        </if>
+        <if test="keyword != null and keyword !=''">
+            and rule_name like concat('%', #{keyword}, '%')
+        </if>
+        <if test="valueTime != null and valueTime !=''">
+            and value_time = #{valueTime}
+        </if>
+        <if test="status != null ">
+            and status = #{status}
+        </if>
+    </sql>
+
+
+    <update id="deleteByRuleIdAndValueTime" parameterType="java.lang.Integer">
+    	update  data_enter_task
+    	set state = 3
     	where rule_id = #{ruleId} and value_time = #{valueTime
-    </delete>
+    </update>
 </mapper>
\ No newline at end of file

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

@@ -2,8 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.keymobile.indicators.model.mapper.indicators.TaskRuleIndicatorMapper">
 
-
-
 	<select id="getByRuleId" parameterType="java.lang.Integer" resultType="com.keymobile.indicators.model.entity.dataenter.TaskRuleIndicator" >
         select * 
         from data_enter_rule_ind
@@ -11,9 +9,9 @@
     </select>
     
 
-    <delete id="deleteByRuleId" parameterType="java.lang.Integer">
-    	delete
-    	from data_enter_rule_ind
+    <update id="deleteByRuleId" parameterType="java.lang.Integer">
+    	update data_enter_rule_ind
+    	set state = 3
     	where rule_id = #{ruleId}
-    </delete>
+    </update>
 </mapper>
\ No newline at end of file

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

@@ -18,6 +18,15 @@
     	where id = #{id}
     </delete>
 
+	<select id="findRuleByName" resultType="com.keymobile.indicators.model.entity.dataenter.TaskRule">
+		select  *
+		from data_enter_task_rule
+		where state = 1
+		and rule_type = #{ruleType}
+		and name = #{name}
+		limit 1
+	</select>
+
 	<select id="findRuleByPage" resultType="com.keymobile.indicators.model.entity.dataenter.TaskRule">
 		select  *
 		from data_enter_task_rule
@@ -26,7 +35,7 @@
 			and rule_type = #{ruleType}
 		</if>
 		<if test="keyword != null and keyword != ''">
-			and name name like concat('%', keyword, '%')
+			and name like concat('%', keyword, '%')
 		</if>
 		order by update_time desc, name asc
 		limit #{start}, #{pageSize}