修改填报任务规则定义

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

+package com.keymobile.indicators.model.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Objects;
+
+@Data
+@ApiModel("用户对象")
+public class UserModel {
+
+    @ApiModelProperty("用户id")
+    private String id;
+
+    @ApiModelProperty("姓名")
+    private String disName;
+
+    private String orgId;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        UserModel userModel = (UserModel) o;
+        return Objects.equals(id, userModel.id) &&
+                Objects.equals(disName, userModel.disName);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, disName);
+    }
+}

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

+package com.keymobile.indicators.model.entity.dataenter;
+
+import com.keymobile.indicators.model.entity.BaseModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Data
+@Table(name="data_enter_rule_obj")
+@ApiModel("任务单位定义")
+public class TaskRuleGroupObj extends BaseModel {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    @ApiModelProperty("数据对象类型：1、组织机构 2、人员 3、岗位")
+    private Integer objType;
+
+    @ApiModelProperty("单位内容,记录id用,分割")
+    private String name;
+
+    @ApiModelProperty("单位内容,记录id用,分割")
+    private String detail;
+
+
+}

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

+package com.keymobile.indicators.model.mapper.indicators;
+
+import com.keymobile.indicators.model.entity.dataenter.TaskRuleGroupObj;
+import org.apache.ibatis.annotations.Mapper;
+import tk.mybatis.mapper.common.BaseMapper;
+
+import java.util.List;
+
+@Mapper
+public interface TaskRuleObjMapper extends BaseMapper<TaskRuleGroupObj> {
+
+    List<TaskRuleGroupObj> findAllByRuleType(Integer ruleType);
+}

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

+package com.keymobile.indicators.service;
+
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@Service
+@FeignClient(name = "PORTAL")
+public interface SystemAuthService {
+
+    /**
+     * 查找用户
+     * @param roleId
+     * @param filter
+     * @param userId
+     * @param orgNo
+     * @param disname
+     * @param page
+     * @param size
+     * @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);
+}

src/main/resources/mybatis/mapping/TaskRuleObjMapper.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.TaskRuleObjMapper">
+    <select id="findAllByRuleType" parameterType="java.lang.Integer" resultType="com.keymobile.indicators.model.entity.dataenter.TaskRuleGroupObj">
+        select *
+        from data_enter_rule_obj
+        where state = 1
+        <if test="ruleType != null and ruleType != ''">
+            and rule_type = #{ruleType}
+        </if>
+        order by update_time desc
+    </select>
+</mapper>