整改清单查看功能开发

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxProjectManageDao.java

@@ -31,8 +31,8 @@ public interface ZhcxProjectManageDao extends BaseMapper<ZhcxProjectManageDo> {
 //            "x.STATUS is not null " +
 //            "</script>")
 //    List<ZhcxProjectRectifyMachineVo> getListData(Map<String, Object> map);
-    @Select("<script>SELECT di.SORT AS DEPTSORT,di2.SORT AS FIRSTDEPTSORT," +
-            "x.* FROM INCONTROL.ZHCX_PROJECT_RECTIFY_MACHINE x " +
+    @Select("<script>SELECT x.*, di.SORT AS DEPTSORT,di2.SORT AS FIRSTDEPTSORT" +
+            " FROM INCONTROL.ZHCX_PROJECT_RECTIFY_MACHINE x " +
             "LEFT JOIN SYS_DICT di ON x.DEPTID = di.ID AND di.DICTTYPE = 'rectification_organization' " +
             "LEFT JOIN SYS_DICT di2 ON x.FIRSTDEPTID  = di2.ID AND di.DICTTYPE = 'rectification_organization' " +
             "<where> " +
@@ -50,7 +50,7 @@ public interface ZhcxProjectManageDao extends BaseMapper<ZhcxProjectManageDo> {
             "</script>")
     List<ZhcxProjectRectifyMachineVo> getListData(Map<String, Object> map);
 
-    @Select("<script>SELECT x.* FROM INCONTROL.ZHCX_PROJECT_RECTIFY_MACHINE x " +
+    @Select("<script>SELECT x.*,x.FINISHDATE AS FINISHDATEFMT FROM INCONTROL.ZHCX_PROJECT_RECTIFY_MACHINE x " +
             "<where> " +
             "<if test='batchId !=null'>" +
             "AND x.BATCHID=#{batchId}" +

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxProjectManageServiceImpl.java

@@ -505,7 +505,7 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
                 if (ev.getData().stream().noneMatch(data -> data.getMachineno().equals(no))) {
                     ev.getData().add(new ZhcxProjectRectifyMachineVo(no));
                 }
-                String format = DateUtil.format(ev.getReqdate(), "yyyy-MM-dd");
+                String format = DateUtil.format(ev.getReqdate(), "yyyy.MM.dd");
                 ev.setReqDateFmt(format);
             });
             ev.getData().sort(Comparator.comparingInt(a -> machineNoList.indexOf(a.getMachineno())));

business-entity/src/main/java/com/rongwei/bsentity/vo/ZhcxProjectRectifyMachineVo.java

@@ -1,8 +1,11 @@
 package com.rongwei.bsentity.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.rongwei.bsentity.domain.ZhcxProjectRectifyMachineDo;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class ZhcxProjectRectifyMachineVo extends ZhcxProjectRectifyMachineDo {
 
@@ -10,6 +13,9 @@ public class ZhcxProjectRectifyMachineVo extends ZhcxProjectRectifyMachineDo {
 
     private Integer firstdeptsort;
 
+    @JsonFormat(pattern = "yyyy.MM.dd")
+    private Date finishdatefmt;
+
     public ZhcxProjectRectifyMachineVo(String no) {
         this.setMachineno(no);
     }