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

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

@@ -401,7 +401,6 @@ public class DataEnterCtrl {
                     data.add(value.getIndName());
                     data.add(value.getIndUnit());
                     data.add(value.getObjName());
-                    data.add(value.getIndValue());
                     if (StringUtils.isNotBlank(value.getIndValue())) {
                         data.add(value.getIndValue());
                     } else {
@@ -412,6 +411,11 @@ public class DataEnterCtrl {
                     } else {
                         data.add("");
                     }
+                    if (StringUtils.isNotBlank(value.getDescription())) {
+                        data.add(value.getDescription());
+                    } else {
+                        data.add("");
+                    }
                     datas.add(data);
                 }
             } else {
@@ -517,7 +521,7 @@ public class DataEnterCtrl {
                                ExcelObj obj, boolean hasSameTerm, List<String> data) {
         for (TaskIndValue value : values) {
             if (indicator.getIndId().equals(value.getIndId()) &&
-                    obj.getObjType().equals(value.getObjType())&&
+//                    obj.getObjType().equals(value.getObjType())&&
                     obj.getObjId().equals(value.getObjId())) {
                 if (StringUtils.isNotBlank(value.getIndValue())) {
                     data.add(value.getIndValue());

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

@@ -79,4 +79,6 @@ public interface TaskMapper extends BaseMapper<Task> {
     Integer selectAuDateOrEnDateCounts( QueryTaskParam param);
 
     Integer updateTaskStatusById(@Param("taskId") String taskId,@Param("status") Integer status);
+
+    String selectToRoleIdByTaskId(String taskId);
 }

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

@@ -284,19 +284,25 @@ public class TaskServiceImpl implements TaskService {
         Task task = taskMapper.getById(taskId);
         String ruleLevel = task.getRuleLevel();
         String orgNo = task.getOrgNo();
+        String auditUsers = task.getAuditUsers();
         TaskRuleTargetRoles taskRuleTargetRoles = taskRuleTargetRolesMapper.getByOrgNo(orgNo);
-
-//        ConfigInfo configInfo = null;
-//        if (Constants.PRIVINCE_TO_CITY.equals(ruleLevel)) {
-//            configInfo = configInfoService.getConfigInfoById(Constants.RULE_PROVINCE_AUDIT_ROLE);
-//        } else if (Constants.PRIVINCE_TO_COUNTY.equals(ruleLevel)) {
-//            configInfo = configInfoService.getConfigInfoById(Constants.RULE_CITY_AUDIT_ROLE);
-//        } else if (Constants.CITY_TO_COUNTY.equals(ruleLevel)) {
-//            configInfo = configInfoService.getConfigInfoById(Constants.RULE_COUNTY_AUDIT_ROLE);
-//        }
+        String enterRoleIdsStr = taskRuleTargetRoles.getEnterRoleIds();
+        String auditRoleIds = taskRuleTargetRoles.getAuditRoleIds();
+        String[] enterRoleIds = enterRoleIdsStr.split(Constants.SEP_COMMA);
+        //获取填报人角色id
+        String roleId = taskMapper.selectToRoleIdByTaskId(taskId);
+        //找不到对应的，按原来的方法走。。。。
+
+        String roleIdStr=taskRuleTargetRoles.getAuditRoleIds();
+        for (int i=0;i<enterRoleIds.length;i++) {
+            if(enterRoleIds[i].equals(roleId)){
+                roleIdStr = auditRoleIds.split(Constants.SEP_COMMA)[i];
+                break;
+            }
+        }
         if (taskRuleTargetRoles != null) {
             String indDept = task.getRefIndDept();
-            List<RoleRefUserModel> users = getUserByRoleIdStr(taskRuleTargetRoles.getAuditRoleIds());
+            List<RoleRefUserModel> users = getUserByRoleIdStr(roleIdStr);
             if (CollectionUtils.isNotEmpty(users)) {
                 StringBuilder userIds = new StringBuilder(Constants.SEP_COMMA);
                 StringBuilder userNames = new StringBuilder(Constants.SEP_COMMA);

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

@@ -168,5 +168,8 @@
       `status`=#{status}
       WHERE state = 1 and id= #{taskId}
   </update>
-
+    <select id="selectToRoleIdByTaskId" resultType="java.lang.String"  parameterType="java.lang.String">
+        select rule.to_role_ids from  data_enter_task_rule rule,
+      data_enter_task task where rule.id = task.rule_id and task.id=#{taskId}
+    </select>
 </mapper>
\ No newline at end of file