优化

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

@@ -36,7 +36,7 @@ public class QueryAllTaskParam {
     @ApiModelProperty("任务状态：1、填报中 2、审批中 3、审核通过 4、驳回 5 任务下发")
     private Integer status;
 
-    @ApiModelProperty("任务状态数组：1、填报中 2、审批中 3、审核通过 4、驳回 5 任务下发")
+    @ApiModelProperty("任务状态数组：1、填报中 2、审批中 3、审核通过 4、确认通过 5 任务下发")
     private List<Integer> statusArr;
 
     @ApiModelProperty("归属部门，对应数据项的归属部门")

src/main/java/com/keymobile/indicators/model/entity/shortboard/ShortBoardTask.java

@@ -57,7 +57,7 @@ public class ShortBoardTask  implements Serializable {
 	/**
 	 * 短板名称
 	 */
-	@ApiModelProperty("短板名称")
+	@ApiModelProperty("短板名称--筛选规则拼接而成")
 	@Column(name = "shortboard_name" )
 	private String shortboardName;
 
@@ -186,7 +186,7 @@ public class ShortBoardTask  implements Serializable {
 	/**
 	 * 短板规则名称逗号分隔
 	 */
-	@ApiModelProperty("短板规则名称逗号分隔")
+	@ApiModelProperty("短板规则名称逗号分隔）和短板名称一样（shortboardName）作废")
 	@Column(name = "rule_names" )
 	private String ruleNames;
 	/**

src/main/java/com/keymobile/indicators/model/entity/shortboard/ShortBoardWarnData.java

@@ -15,9 +15,9 @@ public class ShortBoardWarnData {
     @ApiModelProperty("短板对象集合")
     private  List<String> commpareObjs;
     @ApiModelProperty("考核指标id集合")
-    private List<String> driveIndIds;//考核指标id，多个用分号隔开
+    private List<String> driveIndIds;
     @ApiModelProperty("短板规则id集合")
-    private List<Integer> shortboardIds;//短板规则id，多个用分号隔开
+    private List<Integer> shortboardIds;
     @ApiModelProperty("考核时间")
     private Integer date;//考核时间
     @ApiModelProperty("标识编码")

src/main/java/com/keymobile/indicators/service/hytobacco/ShortboardTaskService.java

@@ -53,22 +53,22 @@ public class ShortboardTaskService {
             shortBoardTask.setRuleIds(shortboardRecord.getShortboardRuleIds());
             shortBoardTask.setStatus(Constants.SHORT_BOARD_START);
             //获取短板筛选规则名称 多个逗号分隔
-            String shortboardRuleIds = shortboardRecord.getShortboardRuleIds();
-            StringBuffer ruleNames = new StringBuffer();
-            if(StringUtils.isNotBlank(shortboardRuleIds)){
-                String[] split = shortboardRuleIds.split(Constants.SEP_COMMA);
-                List<Integer> ruleIds = new ArrayList<>();
-                for (String s : split) {
-                    ruleIds.add(Integer.valueOf(s));
-                }
-                List<ShortboardRule> ShortboardRules = this.shortboardRuleMapper.findByIdList(ruleIds);
-                for (ShortboardRule shortboardRule : ShortboardRules) {
-                    ruleNames.append(shortboardRule.getRuleName());
-                    ruleNames.append(Constants.SEP_COMMA);
-                }
-                ruleNames=ruleNames.delete(ruleNames.length()-1,ruleNames.length());
-            }
-            shortBoardTask.setRuleNames(ruleNames.toString());
+//            String shortboardRuleIds = shortboardRecord.getShortboardRuleIds();
+//            StringBuffer ruleNames = new StringBuffer();
+//            if(StringUtils.isNotBlank(shortboardRuleIds)){
+//                String[] split = shortboardRuleIds.split(Constants.SEP_COMMA);
+//                List<Integer> ruleIds = new ArrayList<>();
+//                for (String s : split) {
+//                    ruleIds.add(Integer.valueOf(s));
+//                }
+//                List<ShortboardRule> ShortboardRules = this.shortboardRuleMapper.findByIdList(ruleIds);
+//                for (ShortboardRule shortboardRule : ShortboardRules) {
+//                    ruleNames.append(shortboardRule.getRuleName());
+//                    ruleNames.append(Constants.SEP_COMMA);
+//                }
+//                ruleNames=ruleNames.delete(ruleNames.length()-1,ruleNames.length());
+//            }
+//            shortBoardTask.setRuleNames(ruleNames.toString());
             //接收人待定
             //  shortBoardTask.setEnterUserId(",1,");
            // shortBoardTask.setEnterUser("root");

src/main/java/com/keymobile/indicators/service/hytobacco/ShortboardUnitService.java

@@ -135,14 +135,13 @@ public class ShortboardUnitService {
 		Map<String,Object> paramMap = new HashMap<>();
 		Map<String,Object> result = new HashMap<>();
 		paramMap.put("codes", codes);
+		paramMap.put("userId",SystemUserUtil.getCurrentUserId());
 		int count = shortboardRecordMapper.countByCodeIn(paramMap);
 		//计算start
 		int start = page*rows;
 		paramMap.put("start", start);
 		paramMap.put("end", rows);
-		paramMap.put("userId",SystemUserUtil.getCurrentUserId());
 		List<ShortboardRecord> resultList = shortboardRecordMapper.getPageByCodeIn(paramMap);
-		
 		result.put("total", count);
 		result.put("data", resultList);
 		

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

@@ -4,7 +4,7 @@
 	<select id="getPageByCodeIn" parameterType="map" resultType="com.keymobile.indicators.model.entity.shortboard.ShortboardRecord" >
 		select * 
 		from short_board_record 
-		where code in
+		where is_issue=0 and code in
 		 <foreach item="id" collection="codes" open="(" close=")" separator=",">
             #{id}
         </foreach>
@@ -18,10 +18,13 @@
 	<select id="countByCodeIn" parameterType="map" resultType="java.lang.Integer" >
 		select count(1) 
 		from short_board_record 
-		where code in
+		where  is_issue=0 and code in
 		 <foreach item="id" collection="codes" open="(" close=")" separator=",">
             #{id}
         </foreach>
+		<if test="userId != null and userId !=''">
+			and user_id = #{userId}
+		</if>
 	</select>
 	
 	<insert id="batchSave" parameterType="java.util.List">