修改对比单位相关接口，限制对象为组织机构或者其他

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

@@ -84,6 +84,16 @@ public class DataEnterCtrl {
                             objs.add(authModel);
                         }
                         break;
+                    case Constants.OBJ_TYPE_OTHER:
+                        List<JSONObject> others = systemAuthService.getStandardObjByIds(idList);
+                        for (JSONObject jo : others) {
+                            AuthModel authModel = new AuthModel();
+                            authModel.setObjType(Constants.OBJ_TYPE_OTHER);
+                            authModel.setName(jo.getString("name"));
+                            authModel.setId(jo.getString("id"));
+                            objs.add(authModel);
+                        }
+                        break;
                 }
                 if (objs.isEmpty()) {
                     log.error("没有可用的填报单位信息");

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

@@ -74,9 +74,8 @@ public class ExcelTempCtrl {
         if (obj != null && obj.getDetail() != null) {
             objIds = Arrays.asList(StringUtils.split(obj.getDetail(), Constants.SEP_COMMA));
             switch (objType) {
-                case 1:
+                case Constants.OBJ_TYPE_ORG:
                     //组织
-                    List<RoleRefUserModel> users = new ArrayList<>();
                     List<JSONObject> orgs =
                             systemAuthService.getOrgByNos(objIds);
                     for (String oid : objIds) {
@@ -93,11 +92,21 @@ public class ExcelTempCtrl {
                         }
                     }
                     break;
-                case 2:
-                    //人员
-                    break;
-                case 3:
-                    //角色
+                case Constants.OBJ_TYPE_OTHER:
+                    //其他
+                    List<JSONObject> others = systemAuthService.getStandardObjByIds(objIds);
+                    for (String oid : objIds) {
+                        for (JSONObject jo : others) {
+                            String id = jo.getString("id");
+                            if (oid.equals(id)) {
+                                AuthModel authModel = new AuthModel();
+                                authModel.setObjType(Constants.OBJ_TYPE_OTHER);
+                                authModel.setName(jo.getString("name"));
+                                authModel.setId(id);
+                                list.add(authModel);
+                            }
+                        }
+                    }
                     break;
                 default:
                     break;

src/main/java/com/keymobile/indicators/constant/Constants.java

@@ -126,9 +126,9 @@ public class Constants {
     public static final int OBJ_TYPE_ORG = 1;
 
     /**
-     * 对象类型- 组织机构-2
+     * 对象类型- 其他-2
      */
-    public static final int OBJ_TYPE_USER = 2;
+    public static final int OBJ_TYPE_OTHER = 2;
 
 
     /**

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

@@ -5,10 +5,7 @@ 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;
+import javax.persistence.*;
 
 @Data
 @Table(name="data_enter_rule_obj")
@@ -37,7 +34,7 @@ public class TaskRuleGroupObj extends BaseModel {
     @ApiModelProperty("任务级别,根据ruleType从配置项获取")
     private String ruleLevel;
 
-    @ApiModelProperty("数据对象类型：1、组织机构 2、人员 3、岗位")
+    @ApiModelProperty("数据对象类型：1、组织机构 2、其他")
     private Integer objType;
 
     @ApiModelProperty("单位内容,记录id用,分割")
@@ -46,5 +43,9 @@ public class TaskRuleGroupObj extends BaseModel {
     @ApiModelProperty("单位内容,记录id用,分割")
     private String detail;
 
+    @ApiModelProperty("单位内容,记录name用,分割")
+    @Transient
+    private String detailNames;
+
 
 }

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

@@ -59,4 +59,12 @@ public interface SystemAuthService {
      */
     @GetMapping("getUserOrgNo")
     String getUserOrgNo(@RequestParam("userid") String id);
+
+    /**
+     * 根据主键集合获取对标对象
+     * @param ids
+     * @return
+     */
+    @GetMapping("/standardObj/listByIds")
+    List<JSONObject> getStandardObjByIds(@RequestParam("ids") List<String> ids);
 }

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

 package com.keymobile.indicators.service.dataenter.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.keymobile.indicators.constant.Constants;
+import com.keymobile.indicators.model.entity.AuthModel;
 import com.keymobile.indicators.model.entity.dataenter.TaskRuleGroupObj;
 import com.keymobile.indicators.model.mapper.indicators.TaskRuleObjMapper;
+import com.keymobile.indicators.service.SystemAuthService;
 import com.keymobile.indicators.service.dataenter.TaskRuleGroupObjService;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.List;
 
 @Service
@@ -13,6 +19,9 @@ public class TaskRuleGroupObjServiceImpl implements TaskRuleGroupObjService {
     @Autowired
     private TaskRuleObjMapper taskRuleObjMapper;
 
+    @Autowired
+    private SystemAuthService systemAuthService;
+
     @Override
     public Integer save(TaskRuleGroupObj obj) {
         if (obj.getId() == null || obj.getId() == 0) {
@@ -25,7 +34,31 @@ public class TaskRuleGroupObjServiceImpl implements TaskRuleGroupObjService {
 
     @Override
     public TaskRuleGroupObj getById(Integer id) {
-        return taskRuleObjMapper.getById(id);
+        TaskRuleGroupObj obj = taskRuleObjMapper.getById(id);
+        if (obj != null && StringUtils.isNotBlank(obj.getDetail())) {
+            String[] ids = StringUtils.split(obj.getDetail(), Constants.SEP_COMMA);
+            List<String> idList = Arrays.asList(ids);
+            List<JSONObject> objectList = null;
+            switch (obj.getObjType()) {
+                case Constants.OBJ_TYPE_ORG:
+                    objectList = systemAuthService.getOrgByNos(idList);
+                    break;
+                case Constants.OBJ_TYPE_OTHER:
+                    objectList = systemAuthService.getStandardObjByIds(idList);
+                    break;
+                default:
+                    break;
+            }
+            if (objectList != null) {
+                StringBuilder sb = new StringBuilder();
+                for (JSONObject jo : objectList) {
+                    sb.append(jo.getString("name"));
+                    sb.append(Constants.SEP_COMMA);
+                }
+                obj.setDetailNames(sb.toString());
+            }
+        }
+        return obj;
     }
 
     @Override

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

@@ -443,7 +443,17 @@ public class TaskServiceImpl implements TaskService {
                             models.add(model);
                         }
                         break;
-                    case Constants.OBJ_TYPE_USER:
+                    case Constants.OBJ_TYPE_OTHER:
+                        List<JSONObject> others = systemAuthService.getStandardObjByIds(ids);
+                        for (JSONObject jo : others) {
+                            AuthModel authModel = new AuthModel();
+                            authModel.setObjType(Constants.OBJ_TYPE_OTHER);
+                            authModel.setName(jo.getString("name"));
+                            authModel.setId(jo.getString("id"));
+                            models.add(authModel);
+                        }
+                        break;
+                    default:
                         break;
                 }
                 Map<String, String> idMapValues = new HashMap<>();