工作填报增加开始结束日期字段

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDeclare.java

@@ -48,6 +48,16 @@ public class CmcDeclare extends BaseEntity
     @Excel(name = "工作内容")
     private String workContent;
 
+    /** 开始日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "开始日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date beginDate;
+
+    /** 结束日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "结束日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date endDate;
+
     /** 工天 */
     @Excel(name = "工天")
     private String workLoad;
@@ -175,6 +185,24 @@ public class CmcDeclare extends BaseEntity
     {
         return workContent;
     }
+    public void setBeginDate(Date beginDate)
+    {
+        this.beginDate = beginDate;
+    }
+
+    public Date getBeginDate()
+    {
+        return beginDate;
+    }
+    public void setEndDate(Date endDate)
+    {
+        this.endDate = endDate;
+    }
+
+    public Date getEndDate()
+    {
+        return endDate;
+    }
     public void setWorkLoad(String workLoad) 
     {
         this.workLoad = workLoad;

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeclareMapper.xml

@@ -13,6 +13,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="workType"    column="work_type"    />
         <result property="workItem"    column="work_item"    />
         <result property="workContent"    column="work_content"    />
+        <result property="beginDate"    column="begin_date"    />
+        <result property="endDate"    column="end_date"    />
         <result property="workLoad"    column="work_load"    />
         <result property="price"    column="price"    />
         <result property="coefficient"    column="coefficient"    />
@@ -30,7 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcDeclareVo">
-        select d.form_id, d.project_id, p.project_number, p.project_name, p.project_leader, d.user_id, u.dept_id, u.nick_name, d.work_type, d.work_item, d.work_content, d.work_load, d.price, d.coefficient, d.check_status, d.audit_status, d.submit_time, d.confirm_status from cmc_declare as d
+        select d.form_id, d.project_id, p.project_number, p.project_name, p.project_leader, d.user_id, u.dept_id, u.nick_name, d.work_type, d.work_item, d.work_content,
+               d.begin_date, d.end_date, d.work_load, d.price, d.coefficient, d.check_status, d.audit_status, d.submit_time, d.confirm_status from cmc_declare as d
         left join sys_user as u on u.user_id = d.user_id
         left join cmc_project as p on p.project_id = d.project_id
     </sql>
@@ -51,6 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="workType != null  and workType != ''"> and d.work_type = #{workType}</if>
             <if test="workItem != null  and workItem != ''"> and d.work_item = #{workItem}</if>
             <if test="workContent != null  and workContent != ''"> and d.work_content = #{workContent}</if>
+            <if test="beginDate != null "> and date_format(d.begin_date, '%y%m') = date_format(#{beginDate}, '%y%m')</if>
+            <if test="endDate != null "> and date_format(d.end_date, '%y%m') = date_format(#{endDate}, '%y%m')</if>
             <if test="workLoad != null  and workLoad != ''"> and d.work_load = #{workLoad}</if>
             <if test="price != null "> and d.price = #{price}</if>
             <if test="coefficient != null  and coefficient != ''"> and d.coefficient = #{coefficient}</if>
@@ -76,6 +81,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="workType != null">work_type,</if>
             <if test="workItem != null">work_item,</if>
             <if test="workContent != null">work_content,</if>
+            <if test="beginDate != null">begin_date,</if>
+            <if test="endDate != null">end_date,</if>
             <if test="workLoad != null">work_load,</if>
             <if test="price != null">price,</if>
             <if test="coefficient != null">coefficient,</if>
@@ -91,6 +98,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="workType != null">#{workType},</if>
             <if test="workItem != null">#{workItem},</if>
             <if test="workContent != null">#{workContent},</if>
+            <if test="beginDate != null">#{beginDate},</if>
+            <if test="endDate != null">#{endDate},</if>
             <if test="workLoad != null">#{workLoad},</if>
             <if test="price != null">#{price},</if>
             <if test="coefficient != null">#{coefficient},</if>
@@ -109,6 +118,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="workType != null">work_type = #{workType},</if>
             <if test="workItem != null">work_item = #{workItem},</if>
             <if test="workContent != null">work_content = #{workContent},</if>
+            <if test="beginDate != null">begin_date = #{beginDate},</if>
+            <if test="endDate != null">end_date = #{endDate},</if>
             <if test="workLoad != null">work_load = #{workLoad},</if>
             <if test="price != null">price = #{price},</if>
             <if test="coefficient != null">coefficient = #{coefficient},</if>