修改撤销审核状态,修改项目查看返回合同时间

ruoyi-system/src/main/java/com/ruoyi/system/domain/project/BmProjectConstruction.java

@@ -53,13 +53,13 @@ public class BmProjectConstruction extends BaseEntity
     /**
      * 合同约定开工时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date orderBeginTime;
 
     /**
      * 合同约定竣工时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date orderEndTime;
 
     public Date getOrderBeginTime() {

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/project/BmProjectServiceImpl.java

@@ -255,6 +255,11 @@ public class BmProjectServiceImpl implements IBmProjectService {
             }
             //判断是否是提交审核/通过审核
             projectStatus = (code & 1) == 1 ? projectStatus + EXAMINE_COMMIT : projectStatus - EXAMINE_COMMIT;
+
+            //判断如果是撤销审核需要在减一
+            if (code.equals(EXAMINE_FOUR)){
+                projectStatus = projectStatus - EXAMINE_COMMIT;
+            }
             if (projectStatus < EXAMINE_COMMIT) {
                 projectStatus = EXAMINE_COMMIT;
             }

ruoyi-system/src/main/resources/mapper/system/project/BmProjectConstructionMapper.xml

@@ -18,6 +18,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="constructionEnddate"    column="construction_enddate"    />
         <result property="constructionDoc"    column="construction_doc"    />
         <result property="constructionPhoto"    column="construction_photo"    />
+        <result property="orderBeginTime"    column="order_begin_time"    />
+        <result property="orderEndTime"    column="order_end_time"    />
     </resultMap>
 
     <sql id="selectBmProjectConstructionVo">