bug#351

application-facade/src/main/java/com/factory/web/entity/pm/res/PmCheckRecordRes.java

@@ -35,4 +35,6 @@ public class PmCheckRecordRes implements Serializable {
     @ApiModelProperty(value = "重检旧值")
     private int resultBak;
 
+    @ApiModelProperty(value = "0未提交1待重检2放行3重检4通过")
+    private int status;
 }

application-facade/src/main/java/com/factory/web/service/impl/FileServiceImpl.java

@@ -156,7 +156,7 @@ public class FileServiceImpl extends ServiceImpl<FileMapper, FileEntry> implemen
                         nmMap.put(day, userNm);
                         if(r.getResultBak()==1) {
                         	datas[2 + day] = "×";
-                        	sb.append(r.getResult()==0?"√,":"x,");
+                        	sb.append(r.getResult()==0?"√,":(r.getStatus()==2?"放行,":"x,"));
                         }else if (r.getResult()==0) {
                             datas[2 + day] = "√";
                         }else {

application-facade/src/main/resources/mapper/PreventMistakeMapper.xml

@@ -186,7 +186,8 @@
         SELECT 
         oir.created_time as taskTime,
         oir.result,
-        oir.result_bak resultBak
+        oir.result_bak resultBak,
+        ot.`status`
         FROM 
         onsite_task ot 
         join onsite_item_result oir on oir.onsite_task_id = ot.id