短板保留历史填报值

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

@@ -25,6 +25,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import scala.Int;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -45,9 +46,10 @@ public class ShortboardTaskValCtrl {
 
     @ApiOperation(value = "查找任务清单填报值", notes = "通过id查找任务清单填报值")
     @GetMapping("findById")
-    public ShortBoardTaskVal findById(@RequestParam Integer shortBoardTaskId){
+    public ShortBoardTaskVal findById(@RequestParam("shortBoardTaskId") Integer shortBoardTaskId,
+                                      @RequestParam("auditCount") Integer auditCount){
         LogManager.logInfo(Constants.LOG_INDICATOR_SHORTBOARD_TASK_API,"查找任务清单填报值{}","");
-        return   shortboardTaskService.selectShortBoardTaskValByTaskIdId(shortBoardTaskId);
+        return   shortboardTaskService.selectShortBoardTaskValByTaskIdAndAuditCount(shortBoardTaskId,auditCount);//selectShortBoardTaskValByTaskIdId(shortBoardTaskId);
     }
 
     @ApiOperation(value = "保存短板清单填报(在线填报)", notes = "保存短板清单填报(在线填报)")
@@ -63,12 +65,12 @@ public class ShortboardTaskValCtrl {
 
     @ApiOperation(value = "保存短板清单填报(excel填报)", notes = "保存短板清单填报(excel填报)")
     @PostMapping("importData")
-    public Result saveDataByExcel(@RequestParam("file") MultipartFile file, @ApiParam("短板清单id")@RequestParam("id") Integer id){
+    public Result saveDataByExcel(@RequestParam("file") MultipartFile file,
+                                  @ApiParam("短板清单id")@RequestParam("id") Integer id,
+                                  @ApiParam("审核次数")@RequestParam("auditCount")Integer auditCount){
+
+        ShortBoardTaskVal shortBoardTaskVal = shortboardTaskService.selectShortBoardTaskValByTaskIdAndAuditCount(id,auditCount);//shortboardTaskService.selectShortBoardTaskValByTaskIdId(id);
 
-        ShortBoardTaskVal shortBoardTaskVal = shortboardTaskService.selectShortBoardTaskValByTaskIdId(id);
-        if(shortBoardTaskVal==null){
-            shortBoardTaskVal = new ShortBoardTaskVal();
-        }
         shortBoardTaskVal.setShortBoardTaskId(id);
         int x=6;
         int y=1;
@@ -103,14 +105,14 @@ public class ShortboardTaskValCtrl {
     }
     @ApiOperation(value = "下载excel模板", notes = "下载excel模板")
     @GetMapping("exportToExcel")
-    public void exportToExcel(@RequestParam("id")Integer id, HttpServletResponse response) throws IOException {
+    public void exportToExcel(@RequestParam("id")Integer id,@RequestParam("auditCount") Integer auditCount, HttpServletResponse response) throws IOException {
         try {
             List<List<String>> headers = new ArrayList<>();
             List<List<String>> datas = new ArrayList<>();
             response.setContentType("application/vnd.ms-excel");
             response.setCharacterEncoding("utf-8");
             ExcelWriterBuilder writerBuilder = EasyExcel.write(response.getOutputStream());
-            ShortBoardTaskVal shortBoardTaskVal = shortboardTaskService.selectShortBoardTaskValByTaskIdId(id);
+            ShortBoardTaskVal shortBoardTaskVal = shortboardTaskService.selectShortBoardTaskValByTaskIdAndAuditCount(id,auditCount);//selectShortBoardTaskValByTaskIdId(id);
             ShortBoardTask shortBoardTask = shortboardTaskService.selectShortBoardTaskById(id);
             String fileName = URLEncoder.encode("短板任务清单填报", "UTF-8");
             String levelArr[] = {"省","市","县"};

src/main/java/com/keymobile/indicators/model/entity/objscorerule/ObjScoreCalResult.java

@@ -25,7 +25,7 @@ public class ObjScoreCalResult {
 	private String scoreValue;//考核对象得分
 	private String improveValue;//考核对象改善得分
 	private Integer scoreRank;//得分排名
-	private String scoreSumValue;//指标总积分
+	private String scoreSumValue;//指标总积分...等综合评价累加和+改善提升累加和
 	private Integer indCount;//指标个数
 	private String code;//机构编码
 	private String compareCatalog;//对标单元目录

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

@@ -203,6 +203,12 @@ public class ShortBoardTask  implements Serializable {
 	/**
 	 * 改善措施
 	 */
+	@ApiModelProperty("审核次数")
+	@Column(name="audit_count")
+	private Integer auditCount;
+	/**
+	 * 改善措施
+	 */
 	@ApiModelProperty("改善措施")
 	@Transient
 	private String improveMeasure;

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

@@ -98,5 +98,16 @@ public class ShortBoardTaskVal  implements Serializable {
 	@ApiModelProperty("更新人")
    	@Column(name = "updater" )
 	private String updater;
-
+	/**
+	 * 改善后指标值
+	 */
+	@ApiModelProperty("改善后指标值")
+	@Column(name = "improve_value" )
+	private String improveValue;
+	/**
+	 * 改善措施
+	 */
+	@ApiModelProperty("审核次数")
+	@Column(name="audit_count")
+	private Integer auditCount;
 }

src/main/java/com/keymobile/indicators/model/mapper/indmapper/ShortboardTaskMapper.java

 package com.keymobile.indicators.model.mapper.indmapper;
 
 import com.keymobile.indicators.model.entity.shortboard.ShortBoardTask;
+import com.keymobile.indicators.model.entity.shortboard.ShortBoardTaskVal;
 import com.keymobile.indicators.model.entity.shortboard.ShortboardAnalysisValue;
 import com.keymobile.indicators.model.entity.shortboard.ShortboardParam;
 import org.apache.ibatis.annotations.Mapper;
@@ -22,4 +23,5 @@ public interface ShortboardTaskMapper extends BaseMapper<ShortBoardTask> {
     List<ShortboardAnalysisValue> analysisUnit(ShortboardParam shortboardParam);
 
     List<ShortBoardTask> selectAnalysisDataPageByParam(ShortboardParam shortboardParam);
+
 }

src/main/java/com/keymobile/indicators/model/mapper/indmapper/ShortboardTaskValMapper.java

@@ -2,6 +2,7 @@ package com.keymobile.indicators.model.mapper.indmapper;
 
 import com.keymobile.indicators.model.entity.shortboard.ShortBoardTaskVal;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.BaseMapper;
 
 import java.util.List;
@@ -9,4 +10,7 @@ import java.util.List;
 @Mapper
 public interface ShortboardTaskValMapper extends BaseMapper<ShortBoardTaskVal> {
     List<ShortBoardTaskVal> selectBYShortBoardTaskId(Integer shortBoardTaskId);
+
+    List<ShortBoardTaskVal> selectShortBoardTaskValByTaskIdAndAuditCount(@Param("taskId") Integer taskId,
+                                                                         @Param("auditCount") Integer auditCount);
 }

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

@@ -230,7 +230,7 @@ public class ScoreRuleService {
 			Double scoreSumValue=0.0;
 			//计算总积分
 			if("2".equals(scoreRule.getScoreType())){
-				scoreSumValue = (Double.parseDouble(scoreTmpSumValue));
+				scoreSumValue = Double.parseDouble(CalculateUtils.sumValue(values));//(Double.parseDouble(scoreTmpSumValue));
 			}else{
 				scoreSumValue = (Double.parseDouble(CalculateUtils.sumValue(values))+
 						Double.parseDouble(CalculateUtils.sumValue(improveValues)));

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

@@ -67,6 +67,7 @@ public class ShortboardTaskService {
             if(split.length>2){
                 shortBoardTask.setCreateUser(split[2]);
             }
+            shortBoardTask.setAuditCount(0);//默认审核次数为0//用于检索历史记录
             shortBoardTask.setCreateTime(date);
             shortBoardTask.setUpdateTime(date);
             shortBoardTask.setUpdater(currentUser);
@@ -149,11 +150,14 @@ public class ShortboardTaskService {
 
     public Result updateTaskStatus(Integer taskId, Integer status,String description) {
         Date date = new Date();
-        ShortBoardTask shortBoardTask = new ShortBoardTask();
+        ShortBoardTask shortBoardTask = shortboardTaskMapper.selectByPrimaryKey(taskId);
         shortBoardTask.setUpdateTime(date);
         shortBoardTask.setUpdater(SystemUserUtil.getCurrentUser());
-        shortBoardTask.setId(taskId);
         shortBoardTask.setStatus(status);
+        if(status==Constants.SHORT_BOARD_IMPROVED_BELOW){
+            //不合格是版本号加一
+            shortBoardTask.setAuditCount(shortBoardTask.getAuditCount()+1);
+        }
         shortboardTaskMapper.updateByPrimaryKeySelective(shortBoardTask);
         String message ="把id={}的短板清单状态修改为{} ";
         LogManager.logInfo(Constants.LOG_INDICATOR_SHORTBOARD_AUDIT_API,message,taskId,status);
@@ -209,4 +213,15 @@ public class ShortboardTaskService {
     public List<ShortBoardAuditRecord> findAuditRecord(Integer taskId) {
         return this.shortBoardAuditRecordMapper.findAuditRecord(taskId);
     }
+
+    public ShortBoardTaskVal selectShortBoardTaskValByTaskIdAndAuditCount(Integer taskId, Integer auditCount) {
+
+       List<ShortBoardTaskVal> shortBoardTaskVals =  shortboardTaskValMapper.selectShortBoardTaskValByTaskIdAndAuditCount(taskId,auditCount);
+        ShortBoardTaskVal shortBoardTaskVal = new ShortBoardTaskVal();
+
+        if(shortBoardTaskVals!=null&&shortBoardTaskVals.size()>0){
+            shortBoardTaskVal=shortBoardTaskVals.get(0);
+       }
+        return shortBoardTaskVal;
+    }
 }

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

@@ -10,7 +10,11 @@
     </select>
 
 
-
+    <select id="selectShortBoardTaskValByTaskIdAndAuditCount" resultType="com.keymobile.indicators.model.entity.shortboard.ShortBoardTaskVal">
+        select *
+        from short_board_task_val
+        where short_board_task_id = #{taskId} and audit_count=#{auditCount}
+    </select>
 
 
 </mapper>
\ No newline at end of file