Quellcode durchsuchen

修改合同约定时间BUG

Administrator vor 4 Jahren
Ursprung
Commit
11354f4f30

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

@@ -50,34 +50,6 @@ public class BmProjectConstruction extends BaseEntity
     @Excel(name = "开工照片")
     private String constructionPhoto;
 
-    /**
-     * 合同约定开工时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date orderBeginTime;
-
-    /**
-     * 合同约定竣工时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date orderEndTime;
-
-    public Date getOrderBeginTime() {
-        return orderBeginTime;
-    }
-
-    public void setOrderBeginTime(Date orderBeginTime) {
-        this.orderBeginTime = orderBeginTime;
-    }
-
-    public Date getOrderEndTime() {
-        return orderEndTime;
-    }
-
-    public void setOrderEndTime(Date orderEndTime) {
-        this.orderEndTime = orderEndTime;
-    }
-
     public void setId(Long id)
     {
         this.id = id;

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

@@ -18,8 +18,6 @@ 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">
@@ -43,9 +41,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectBmProjectConstructionById" parameterType="Long" resultMap="BmProjectConstructionResult">
-      select c.id, c.bm_project_id, c.create_by, c.create_time, c.update_by, c.update_time, c.is_del, c.construction_code, c.is_construction, c.construction_startdate, c.construction_enddate, c.construction_doc, c.construction_photo, p.order_begin_time, p.order_end_time
+      select c.id, c.bm_project_id, c.create_by, c.create_time, c.update_by, c.update_time, c.is_del, c.construction_code, c.is_construction, c.construction_startdate, c.construction_enddate, c.construction_doc, c.construction_photo
       from bm_project_construction c
-      left join bm_project p on c.bm_project_id = p.id and p.is_del = '0'
       where c.bm_project_id = #{id} limit 1
     </select>