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

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

+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;
+
+/**
+ * excel模板关联的数据项指标
+ */
+@Data
+@Table(name="data_enter_excel_ind")
+public class ExcelIndicator extends BaseModel {
+
+    @Id
+    private Integer id;
+
+    /**
+     * 关联模板id
+     */
+    private Integer tempId;
+
+    /**
+     *  方向 1：纵向、2：横向
+     */
+    private Integer orientation;
+
+    /**
+     * 关联指标id
+     */
+    private String indId;
+
+    /**
+     * 指标名称
+     */
+    private String indName;
+
+    /**
+     * 指标数量来源：1 Excel导入 2 手工录入
+     */
+    private Integer indSource;
+
+    /**
+     * 是否需要同期值
+     */
+    private Boolean needSameTerm;
+
+    /**
+     * 顺序号
+     */
+    private Integer orderNum;
+}

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

+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;
+
+/**
+ * excel模板关联的对象
+ */
+@Data
+@Table(name="data_enter_excel_obj")
+public class ExcelObj extends BaseModel {
+
+    @Id
+    private Integer id;
+
+    /**
+     * 关联模板id
+     */
+    private Integer tempId;
+
+    /**
+     *  方向 1：纵向、2：横向
+     */
+    private Integer orientation;
+
+    /**
+     * 对象id
+     */
+    private String objId;
+
+    /**
+     * 对象名
+     */
+    private String objName;
+
+    /**
+     * 对象类型：1、组织 2、人员 3、数据项
+     */
+    private Integer objType;
+
+    /**
+     * 顺序号
+     */
+    private Integer orderNum;
+}

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

+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;
+
+@Data
+@Table(name = "data_enter_excel_temp")
+public class ExcelTemplate extends BaseModel {
+
+    @Id
+    private Integer id;
+
+    /**
+     * 模板名字
+     */
+    private String name;
+
+    /**
+     * 任务规则id
+     */
+    private Integer ruleId;
+
+    /**
+     * 任务规则所属类型：1、省  2、市 3、县
+     */
+    private Integer ruleType;
+
+    /**
+     * 所属任务id
+     */
+    private String taskId;
+}

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

+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 java.util.List;
+
+/**
+ * 数据填报具体任务
+ */
+@Data
+@Table(name="data_enter_task")
+public class Task extends BaseModel {
+
+    @Id
+    private String id;
+
+    /**
+     * 父id
+     */
+    private String pId;
+
+    /**
+     * 任务规则id
+     */
+    private Integer ruleId;
+
+    /**
+     * 任务规则所属类型：1、省  2、市 3、县
+     */
+    private Integer ruleType;
+
+    /**
+     * 任务规则名称
+     */
+    private String ruleName;
+
+    /**
+     * 数据时间,例如2019-03
+     */
+    private String valueTime;
+
+    /**
+     * 数据截止日期
+     */
+    private String endDate;
+
+    /**
+     * 上报人员id，多个用,分割
+     */
+    private String enterUsers;
+
+    /**
+     * 审核人员id，多个用,分割
+     */
+    private String auditUsers;
+
+    /**
+     * 是否需要分发人员自填
+     */
+    private Boolean needSelfEnter;
+
+    /**
+     * 是否需要汇总
+     */
+    private Boolean needSum;
+
+    /**
+     * 任务状态：1、填报中 2、审批中 3、审核通过 4、驳回
+     */
+    private Integer status;
+
+    /**
+     * 任务关联的数据项信息
+     */
+    @Transient
+    private List<TaskIndicator> indicators;
+}

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

+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;
+
+/**
+ * 任务填报的数据项值
+ */
+@Data
+@Table(name="data_enter_task_ind_val")
+public class TaskIndValue extends BaseModel {
+
+    @Id
+    private String id;
+
+    /**
+     * 任务关联数据项id
+     */
+    private String tiId;
+
+    /**
+     * 所属任务id
+     */
+    private String taskId;
+
+    /**
+     * 指标id
+     */
+    private String indId;
+
+    /**
+     * 指标名称
+     */
+    private String indName;
+
+    /**
+     * 指标数量来源：1 Excel导入 2 手工录入
+     */
+    private Integer indSource;
+
+    /**
+     * 数据项单位
+     */
+    private String unit;
+
+    /**
+     * 指标值
+     */
+    private String indValue;
+
+    /**
+     * 数据时间，例如2020-06表示二季度
+     */
+    private String valueTime;
+
+    /**
+     * 数据对象id
+     */
+    private String objId;
+
+    /**
+     * 数据对象类型：1、组织机构 2、人员
+     */
+    private Integer objType;
+
+    /**
+     * 数据项名称
+     */
+    private String objName;
+    /**
+     * excel导入对应的excel模板id
+     */
+    private Integer tempId;
+}

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

+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;
+
+/**
+ * 任务关联的数据项
+ */
+@Data
+@Table(name="data_enter_task_ind")
+public class TaskIndicator extends BaseModel {
+
+    @Id
+    private String id;
+
+    /**
+     * 任务关联数据项id
+     */
+    private String tiId;
+
+    /**
+     * 所属任务id
+     */
+    private String taskId;
+
+    /**
+     * 指标id
+     */
+    private String indId;
+
+    /**
+     * 指标名称
+     */
+    private String indName;
+
+    /**
+     * 指标数量来源：1 Excel导入 2 手工录入
+     */
+    private Integer indSource;
+}

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

+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 java.util.Date;
+import java.util.List;
+
+/**
+ * 数据填报任务规则定义
+ */
+@Data
+@Table(name="data_enter_task_rule")
+public class TaskRule extends BaseModel {
+
+    @Id
+    private Integer id;
+
+    private String name;
+
+    /**
+     * 任务规则所属类型：1、省  2、市 3、县
+     */
+    private Integer ruleType;
+    /**
+     * 触发类型：1、手动 2、定时
+     */
+    private Integer activeType;
+
+    /**
+     * 定时作业id
+     */
+    private String schId;
+    /**
+     * 定时触发表达式
+     */
+    private String cronExp;
+
+    /**
+     * 触发类型:1、每季
+     */
+    private Integer expType;
+
+    /**
+     * 填报时限:天
+     */
+    private Integer timeLimit;
+    /**
+     * 填报角色id,多个用,分割
+     */
+    private String toRoleIds;
+    /**
+     * 上次触发时间
+     */
+    private Date lastActiveTime;
+
+    /**
+     * 关联的数据项
+     */
+    @Transient
+    private List<TaskIndicator> indicators;
+}

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

+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;
+
+/**
+ * 数据填报任务规则定义
+ */
+@Data
+@Table(name="data_enter_rule_ind")
+public class TaskRuleIndicator extends BaseModel {
+
+    @Id
+    private Integer id;
+
+    /**
+     * 规则id
+     */
+    private String ruleId;
+
+    /**
+     * 指标id
+     */
+    private String indId;
+
+    /**
+     * 指标名称
+     */
+    private String indName;
+
+    /**
+     * 指标数量来源：1 Excel导入 2 手工录入
+     */
+    private Integer indSource;
+}

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

+package com.keymobile.indicators.model.mapper.indicators;
+
+import com.keymobile.indicators.model.entity.dataenter.ExcelIndicator;
+import org.apache.ibatis.annotations.Mapper;
+import tk.mybatis.mapper.common.BaseMapper;
+
+import java.util.List;
+
+@Mapper
+public interface ExcelIndicatorMapper extends BaseMapper<ExcelIndicator> {
+
+
+    /**
+     * 查询模板关联的指标信息
+     * @param tempId
+     * @return
+     */
+    List<ExcelIndicator> getByTempId(Integer tempId);
+
+    /**
+     * 根据模板id删除指标信息
+     * @param tempId
+     */
+    void deleteByTempId(Integer tempId);
+}

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

+package com.keymobile.indicators.model.mapper.indicators;
+
+import com.keymobile.indicators.model.entity.dataenter.ExcelObj;
+import org.apache.ibatis.annotations.Mapper;
+import tk.mybatis.mapper.common.BaseMapper;
+
+import java.util.List;
+
+@Mapper
+public interface ExcelObjMapper extends BaseMapper<ExcelObj> {
+
+    /**
+     * 查询模板关联的考核对象信息
+     * @param tempId
+     * @return
+     */
+    List<ExcelObj> getByTempId(Integer tempId);
+
+    /**
+     * 根据模板id删除考核对象信息
+     * @param tempId
+     */
+    void deleteByTempId(Integer tempId);
+}

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

+package com.keymobile.indicators.model.mapper.indicators;
+
+import com.keymobile.indicators.model.entity.dataenter.ExcelTemplate;
+import org.apache.ibatis.annotations.Mapper;
+import tk.mybatis.mapper.common.BaseMapper;
+
+@Mapper
+public interface ExcelTemplateMapper extends BaseMapper<ExcelTemplate> {
+
+    /**
+     * 逻辑删除模板
+     * @param id
+     */
+    void deleteById(Integer id);
+}

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

+package com.keymobile.indicators.model.mapper.indicators;
+
+import com.keymobile.indicators.model.entity.dataenter.TaskIndValue;
+import org.apache.ibatis.annotations.Mapper;
+import tk.mybatis.mapper.common.BaseMapper;
+
+import java.util.List;
+
+@Mapper
+public interface TaskIndValueMapper extends BaseMapper<TaskIndValue> {
+
+    /**
+     * 根据任务id获取填报数据项值
+     * @param taskId
+     * @return
+     */
+    List<TaskIndValue> getByTaskId(String taskId);
+
+    /**
+     * 任务id删除已填报的数据项值
+     * @param taskId
+     */
+    void deleteByTaskId(String taskId);
+}

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

+package com.keymobile.indicators.model.mapper.indicators;
+
+import com.keymobile.indicators.model.entity.dataenter.TaskIndicator;
+import org.apache.ibatis.annotations.Mapper;
+import tk.mybatis.mapper.common.BaseMapper;
+
+import java.util.List;
+
+@Mapper
+public interface TaskIndicatorMapper extends BaseMapper<TaskIndicator> {
+
+    /**
+     * 根据任务id删除任务数据项
+     * @param taskId
+     */
+    void deleteByTaskId(String taskId);
+
+    /**
+     * 根据任务获取关联的数据项
+     * @param taskId
+     * @return
+     */
+    List<TaskIndicator> getByTaskId(String taskId);
+}

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.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;
+
+import java.util.List;
+
+@Mapper
+public interface TaskMapper extends BaseMapper<Task> {
+
+    /**
+     * 根据任务规则id和取数时间获取任务
+     * @param ruleId
+     * @param valueTime
+     * @return
+     */
+    List<Task> getByRuleIdAndValueTime(@Param("ruleId") Integer ruleId, @Param("valueTime") String valueTime);
+
+    /**
+     * 根据任务规则id和取数时间删除任务
+     * @param ruleId
+     * @param valueTime
+     */
+    void deleteByRuleIdAndValueTime(@Param("ruleId") Integer ruleId, @Param("valueTime") String valueTime);
+}

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

+package com.keymobile.indicators.model.mapper.indicators;
+
+import com.keymobile.indicators.model.entity.dataenter.TaskRuleIndicator;
+import org.apache.ibatis.annotations.Mapper;
+import tk.mybatis.mapper.common.BaseMapper;
+
+import java.util.List;
+
+@Mapper
+public interface TaskRuleIndicatorMapper extends BaseMapper<TaskRuleIndicator> {
+
+    /**
+     * 根据规则id获取关联的数据项
+     * @param ruleId
+     * @return
+     */
+    List<TaskRuleIndicator> getByRuleId(Integer ruleId);
+
+    void deleteByRuleId(Integer ruleId);
+}

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

+package com.keymobile.indicators.model.mapper.indicators;
+
+import com.keymobile.indicators.model.entity.dataenter.TaskRule;
+import org.apache.ibatis.annotations.Mapper;
+import tk.mybatis.mapper.common.BaseMapper;
+
+@Mapper
+public interface TaskRuleMapper extends BaseMapper<TaskRule> {
+
+    /**
+     * 逻辑删除任务规则
+     * @param id
+     */
+    void deleteById(Integer id);
+}

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

+package com.keymobile.indicators.service.dataenter;
+
+import com.keymobile.indicators.model.entity.dataenter.TaskRule;
+import org.springframework.data.domain.Page;
+
+/**
+ * 任务规则管理
+ */
+public interface TaskRuleService {
+
+    /**
+     * 根据规则id删除规则
+     * @param ruleId
+     */
+    void delete(Integer ruleId);
+
+    /**
+     * 根据id获取规则
+     * @param ruleId
+     * @return
+     */
+    TaskRule getById(Integer ruleId);
+
+    /**
+     * 创建规则
+     * @param rule
+     * @return
+     */
+    TaskRule createRule(TaskRule rule);
+
+    /**
+     * 更新规则
+     * @param rule
+     */
+    void updateRule(TaskRule rule);
+
+    /**
+     * 根据规则类型、关键字分页查找规则
+     * @param ruleType
+     * @param keyword
+     * @param pageSize
+     * @param start
+     * @return
+     */
+    Page<TaskRule> findRuleByPage(Integer ruleType, String keyword, int pageSize, int start);
+}

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

+package com.keymobile.indicators.service.dataenter;
+
+import com.keymobile.indicators.model.entity.dataenter.Task;
+import org.springframework.data.domain.Page;
+
+public interface TaskService {
+
+    /**
+     * 根据id删除任务
+     * @param taskId
+     */
+    void delete(String taskId);
+
+    /**
+     * 根据id获取任务详细
+     * @param taskId
+     * @return
+     */
+    Task getById(String taskId);
+
+
+    /**
+     * 根据规则id和取数时间删除任务
+     * @param ruleId
+     * @param valueTime
+     */
+    void deleteByRuleId(Integer ruleId, String valueTime);
+
+    /**
+     * 根据用户id 和 任务规则关键字分页获取任务
+     * @param userId
+     * @param keyword
+     * @param pageSize
+     * @param start
+     * @return
+     */
+    Page<Task> findUserTask(String userId, String keyword, int pageSize, int start);
+
+
+
+}

src/main/resources/application-test.yml

@@ -29,9 +29,9 @@ spring:
     host: 139.198.127.54
     port: 9379
 server:
-  port: 8667
+  port: 9088
   servlet:
-    context-path: /indicators/
+    context-path: /
 
 eureka:
   client:

src/main/resources/mybatis/mapping/ExcelIndicatorMapper.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.ExcelIndicatorMapper">
+
+
+	<select id="getByTempId" parameterType="java.lang.Integer" resultType="com.keymobile.indicators.model.entity.dataenter.ExcelIndicator" >
+        select * 
+        from data_enter_excel_ind
+        where temp_id = #{tempId}
+    </select>
+    
+
+    <delete id="deleteByTempId" parameterType="java.lang.Integer">
+    	delete 
+    	from data_enter_excel_ind
+    	where temp_id = #{tempId}
+    </delete>
+</mapper>
\ No newline at end of file

src/main/resources/mybatis/mapping/ExcelObjMapper.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.ExcelObjMapper">
+    
+
+	<select id="getByTempId" parameterType="java.lang.Integer" resultType="com.keymobile.indicators.model.entity.dataenter.ExcelObj" >
+        select * 
+        from data_enter_excel_obj
+        where temp_id = #{tempId}
+    </select>
+    
+
+    <delete id="deleteByTempId" parameterType="java.lang.Integer">
+    	delete 
+    	from data_enter_excel_obj
+    	where temp_id = #{tempId}
+    </delete>
+</mapper>
\ No newline at end of file

src/main/resources/mybatis/mapping/ExcelTemplateMapper.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.ExcelTemplateMapper">
+
+    <update id="deleteById" parameterType="java.lang.Integer">
+    	update  data_enter_excel_temp
+    	set state = 3
+    	where id = #{id}
+    </update>
+</mapper>
\ No newline at end of file

src/main/resources/mybatis/mapping/TaskIndicatorMapper.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.TaskIndicatorMapper">
+    
+
+	<select id="getByTaskId" parameterType="java.lang.String" resultType="com.keymobile.indicators.model.entity.dataenter.ExcelObj" >
+        select * 
+        from data_enter_task_ind
+        where task_id = #{taskId} and state = 1
+    </select>
+
+
+    <update id="deleteByTaskId" parameterType="java.lang.Integer">
+    	update data_enter_task_ind
+    	set state = 3
+    	where task_id = #{taskId}
+    </update>
+</mapper>
\ No newline at end of file

src/main/resources/mybatis/mapping/TaskIndicatorValueMapper.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.TaskIndValueMapper">
+    
+
+	<select id="getByTaskId" parameterType="java.lang.String" resultType="com.keymobile.indicators.model.entity.dataenter.TaskIndValue" >
+        select *
+        from data_enter_task_ind_val
+        where task_id = #{taskId}
+    </select>
+    
+
+    <delete id="deleteByTaskId" parameterType="java.lang.String">
+    	delete 
+    	from data_enter_task_ind_val
+    	where task_id = #{taskId}
+    </delete>
+</mapper>
\ No newline at end of file

src/main/resources/mybatis/mapping/TaskMapper.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.TaskMapper">
+    
+
+	<select id="getByRuleIdAndValueTime" parameterType="java.lang.Integer" resultType="com.keymobile.indicators.model.entity.dataenter.ExcelObj" >
+        select * 
+        from data_enter_task
+        where rule_id = #{ruleId} and value_time = #{valueTime}
+    </select>
+    
+
+    <delete id="deleteByRuleIdAndValueTime" parameterType="java.lang.Integer">
+    	delete 
+    	from data_enter_task
+    	where rule_id = #{ruleId} and value_time = #{valueTime
+    </delete>
+</mapper>
\ No newline at end of file

src/main/resources/mybatis/mapping/TaskRuleIndicatorMapper.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.TaskRuleIndicatorMapper">
+    
+
+	<select id="getByRuleId" parameterType="java.lang.Integer" resultType="com.keymobile.indicators.model.entity.dataenter.TaskRuleIndicator" >
+        select * 
+        from data_enter_rule_ind
+        where rule_id = #{ruleId} and state = 1
+    </select>
+    
+
+    <delete id="deleteByRuleId" parameterType="java.lang.Integer">
+    	delete
+    	from data_enter_rule_ind
+    	where rule_id = #{ruleId}
+    </delete>
+</mapper>
\ No newline at end of file

src/main/resources/mybatis/mapping/TaskRuleMapper.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.TaskRuleMapper">
+
+    <delete id="deleteById" parameterType="java.lang.Integer">
+    	update data_enter_task_rule
+    	set state = 3
+    	where id = #{id}
+    </delete>
+</mapper>
\ No newline at end of file