增加字段

ygtx-gxt/src/main/java/com/ygtx/gxt/domain/GxtRepairOrder.java

@@ -180,6 +180,9 @@ public class GxtRepairOrder extends BaseEntity
 
     /** 评分状态（to_self-待自评，to_re-待复评，to_confirm-待确认，to_final-待终评，to_archive-待归档，archived-已归档） */
     private String scoringStatus;
+    
+    /** 复评次数 */
+    private Integer reviewScoreNum;
 
     private List<GxtRepairOrderPerson> repairOrderPersonList;
 
@@ -649,6 +652,14 @@ public class GxtRepairOrder extends BaseEntity
     public void setModifyReason(String modifyReason) {
         this.modifyReason = modifyReason;
     }
+    
+    public Integer getReviewScoreNum() {
+        return reviewScoreNum;
+    }
+    
+    public void setReviewScoreNum(Integer reviewScoreNum) {
+        this.reviewScoreNum = reviewScoreNum;
+    }
 
     @Override
     public String toString() {

ygtx-gxt/src/main/java/com/ygtx/gxt/domain/GxtRepairOrderPerson.java

@@ -1,10 +1,13 @@
 package com.ygtx.gxt.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ygtx.common.annotation.Excel;
 import com.ygtx.common.core.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 维修工单工作组员名单对象 gxt_repair_order_person
  * 
@@ -57,6 +60,12 @@ public class GxtRepairOrderPerson extends BaseEntity
     @Excel(name = "是否工作负责人", readConverterExp = "0=否,1=是")
     private Integer isLeader;
 
+    /** 反馈理由 */
+    private String feedbackReason;
+
+    /** 确认状态（0-未确认，1-确认，2-已反馈） */
+    private Integer confirmStatus;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -157,6 +166,22 @@ public class GxtRepairOrderPerson extends BaseEntity
         this.isLeader = isLeader;
     }
 
+    public String getFeedbackReason() {
+        return feedbackReason;
+    }
+
+    public void setFeedbackReason(String feedbackReason) {
+        this.feedbackReason = feedbackReason;
+    }
+
+    public Integer getConfirmStatus() {
+        return confirmStatus;
+    }
+
+    public void setConfirmStatus(Integer confirmStatus) {
+        this.confirmStatus = confirmStatus;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ygtx-gxt/src/main/java/com/ygtx/gxt/domain/GxtWorkOrder.java

@@ -227,6 +227,9 @@ public class GxtWorkOrder extends BaseEntity
     /** 修改理由 */
     private String modifyReason;
 
+    /** 复评次数 */
+    private Integer reviewScoreNum;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -728,6 +731,14 @@ public class GxtWorkOrder extends BaseEntity
         this.itemCompletionFactorSum = itemCompletionFactorSum;
     }
 
+    public Integer getReviewScoreNum() {
+        return reviewScoreNum;
+    }
+
+    public void setReviewScoreNum(Integer reviewScoreNum) {
+        this.reviewScoreNum = reviewScoreNum;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ygtx-gxt/src/main/java/com/ygtx/gxt/domain/GxtWorkOrderPerson.java

@@ -64,6 +64,12 @@ public class GxtWorkOrderPerson extends BaseEntity
     @Excel(name = "是否工作负责人", readConverterExp = "0=否,1=是")
     private Integer isLeader;
 
+    /** 反馈理由 */
+    private String feedbackReason;
+
+    /** 确认状态（0-未确认，1-确认，2-已反馈） */
+    private Integer confirmStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -176,6 +182,22 @@ public class GxtWorkOrderPerson extends BaseEntity
         this.isLeader = isLeader;
     }
 
+    public String getFeedbackReason() {
+        return feedbackReason;
+    }
+
+    public void setFeedbackReason(String feedbackReason) {
+        this.feedbackReason = feedbackReason;
+    }
+
+    public Integer getConfirmStatus() {
+        return confirmStatus;
+    }
+
+    public void setConfirmStatus(Integer confirmStatus) {
+        this.confirmStatus = confirmStatus;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ygtx-gxt/src/main/java/com/ygtx/gxt/domain/OrderScoreInfo.java

@@ -164,6 +164,9 @@ public class OrderScoreInfo {
 
     /** 分项完成系数和 */
     private BigDecimal itemCompletionFactorSum;
+    
+    /** 复评次数 */
+    private Integer reviewScoreNum;
 
     public Integer getOrderType() {
         return orderType;
@@ -572,4 +575,12 @@ public class OrderScoreInfo {
     public void setItemCompletionFactorSum(BigDecimal itemCompletionFactorSum) {
         this.itemCompletionFactorSum = itemCompletionFactorSum;
     }
+    
+    public Integer getReviewScoreNum() {
+        return reviewScoreNum;
+    }
+    
+    public void setReviewScoreNum(Integer reviewScoreNum) {
+        this.reviewScoreNum = reviewScoreNum;
+    }
 }

ygtx-gxt/src/main/java/com/ygtx/gxt/domain/OrderScorePerson.java

@@ -31,6 +31,12 @@ public class OrderScorePerson {
     /** 是否工作负责人（0-否，1-是） */
     private Integer isLeader;
 
+    /** 反馈理由 */
+    private String feedbackReason;
+
+    /** 确认状态（0-未确认，1-确认，2-已反馈） */
+    private Integer confirmStatus;
+
     public Long getId() {
         return id;
     }
@@ -94,4 +100,20 @@ public class OrderScorePerson {
     public void setIsLeader(Integer isLeader) {
         this.isLeader = isLeader;
     }
+
+    public String getFeedbackReason() {
+        return feedbackReason;
+    }
+
+    public void setFeedbackReason(String feedbackReason) {
+        this.feedbackReason = feedbackReason;
+    }
+
+    public Integer getConfirmStatus() {
+        return confirmStatus;
+    }
+
+    public void setConfirmStatus(Integer confirmStatus) {
+        this.confirmStatus = confirmStatus;
+    }
 }

ygtx-gxt/src/main/resources/mapper/gxt/GxtOrderScoreMapper.xml

@@ -50,6 +50,7 @@
         <result property="pauseTime"    column="pause_time"    />
         <result property="completeTime"    column="complete_time"    />
         <result property="status"    column="status"    />
+        <result property="reviewScoreNum"    column="review_score_num"    />
         <!-- 用于统一两个查询结果的列数，但不在OrderScoreInfo中使用 -->
         <result property="planStartTime" column="plan_start_time" />
         <result property="planEndTime" column="plan_end_time" />
@@ -102,7 +103,8 @@
                 null as suspend_time,
                 null as pause_reason,
                 null as pause_time,
-                null as complete_time
+                null as complete_time,
+                review_score_num as review_score_num
             FROM gxt_repair_order t
             <where>
                 <if test="repairOrder.workOrderProjectNo != null and repairOrder.workOrderProjectNo != ''"> and work_order_project_no = #{repairOrder.workOrderProjectNo}</if>
@@ -174,7 +176,8 @@
                 suspend_time as suspend_time,
                 pause_reason as pause_reason,
                 pause_time as pause_time,
-                complete_time as complete_time
+                complete_time as complete_time,
+                review_score_num as review_score_num
             FROM gxt_work_order t
             <where>
                 <if test="workOrder.workOrderProjectNo != null and workOrder.workOrderProjectNo != ''"> and work_order_project_no = #{workOrder.workOrderProjectNo}</if>

ygtx-gxt/src/main/resources/mapper/gxt/GxtRepairOrderMapper.xml

@@ -56,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="scoringStatus"    column="scoring_status"    />
         <result property="pcsStationPid"    column="pcs_station_pid"    />
         <result property="attachmentUrls"    column="attachment_urls"    />
+        <result property="reviewScoreNum"    column="review_score_num"    />
     </resultMap>
 
     <resultMap type="GxtRepairOrder" id="GxtRepairOrderWithPersonResult" extends="GxtRepairOrderResult">
@@ -79,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                accept_user_id, accept_user_name, real_start_time, real_end_time, team_leader_id, team_leader_name, work_group_member_id,
                work_group_member_name, t.create_by, t.create_time, t.update_by, t.update_time, t.remark, content, plan_hour, priority_type, score,
                review_content, maintenance_type, occur_time, fault_barcode, suspend_reason, suspend_description, approval_status,
-               rejection_reason, modify_reason, finalization_remark, related_order_code, related_order_content, mis_order_no, restart_time, scoring_status, pcs_station_pid, attachment_urls
+               rejection_reason, modify_reason, finalization_remark, related_order_code, related_order_content, mis_order_no, restart_time, scoring_status, pcs_station_pid, attachment_urls, review_score_num
         from gxt_repair_order t
         left join sys_user u on u.user_name = t.create_by
         left join sys_dept d on u.dept_id = d.dept_id
@@ -133,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scoringStatus != null "> and scoring_status = #{scoringStatus}</if>
             <if test="pcsStationPid != null "> and pcs_station_pid = #{pcsStationPid}</if>
             <if test="attachmentUrls != null  and attachmentUrls != ''"> and attachment_urls = #{attachmentUrls}</if>
+            <if test="reviewScoreNum != null "> and review_score_num = #{reviewScoreNum}</if>
 
             <!-- 业务特定数据权限过滤条件 -->
             <if test="params.businessDataScope != null and params.businessDataScope != ''">
@@ -205,6 +207,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scoringStatus != null">scoring_status,</if>
             <if test="pcsStationPid != null">pcs_station_pid,</if>
             <if test="attachmentUrls != null and attachmentUrls != ''">attachment_urls,</if>
+            <if test="reviewScoreNum != null">review_score_num,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="workOrderProjectNo != null and workOrderProjectNo != ''">#{workOrderProjectNo},</if>
@@ -257,6 +260,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scoringStatus != null">#{scoringStatus},</if>
             <if test="pcsStationPid != null">#{pcsStationPid},</if>
             <if test="attachmentUrls != null and attachmentUrls != ''">#{attachmentUrls},</if>
+            <if test="reviewScoreNum != null">#{reviewScoreNum},</if>
          </trim>
     </insert>
 
@@ -313,6 +317,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scoringStatus != null">scoring_status = #{scoringStatus},</if>
             <if test="pcsStationPid != null">pcs_station_pid = #{pcsStationPid},</if>
             <if test="attachmentUrls != null and attachmentUrls != ''">attachment_urls = #{attachmentUrls},</if>
+            <if test="reviewScoreNum != null">review_score_num = #{reviewScoreNum},</if>
         </trim>
         where id = #{id}
     </update>
@@ -381,6 +386,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scoringStatus != null "> and scoring_status = #{scoringStatus}</if>
             <if test="pcsStationPid != null "> and pcs_station_pid = #{pcsStationPid}</if>
             <if test="attachmentUrls != null  and attachmentUrls != ''"> and attachment_urls = #{attachmentUrls}</if>
+            <if test="reviewScoreNum != null "> and review_score_num = #{reviewScoreNum}</if>
         </where>
         order by id desc
     </select>
@@ -433,6 +439,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             t1.scoring_status,
             t1.pcs_station_pid,
             t1.attachment_urls,
+            t1.review_score_num,
             t1.create_by,
             t1.create_time,
             t1.update_by,

ygtx-gxt/src/main/resources/mapper/gxt/GxtRepairOrderPersonMapper.xml

@@ -15,6 +15,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reviewScore"    column="review_score"    />
         <result property="finalScore"    column="final_score"    />
         <result property="isLeader"    column="is_leader"    />
+        <result property="feedbackReason"    column="feedback_reason"    />
+        <result property="confirmStatus"    column="confirm_status"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -23,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectGxtRepairOrderPersonVo">
-        select id, user_id, nick_name, order_id, order_code, status, self_score, review_score, final_score, is_leader, create_by, create_time, update_by, update_time, remark from gxt_repair_order_person
+        select id, user_id, nick_name, order_id, order_code, status, self_score, review_score, final_score, is_leader, feedback_reason, confirm_status, create_by, create_time, update_by, update_time, remark from gxt_repair_order_person
     </sql>
 
     <select id="selectGxtRepairOrderPersonList" parameterType="GxtRepairOrderPerson" resultMap="GxtRepairOrderPersonResult">
@@ -38,6 +40,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reviewScore != null "> and review_score = #{reviewScore}</if>
             <if test="finalScore != null "> and final_score = #{finalScore}</if>
             <if test="isLeader != null "> and is_leader = #{isLeader}</if>
+            <if test="feedbackReason != null  and feedbackReason != ''"> and feedback_reason = #{feedbackReason}</if>
+            <if test="confirmStatus != null "> and confirm_status = #{confirmStatus}</if>
         </where>
     </select>
     
@@ -58,6 +62,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reviewScore != null">review_score,</if>
             <if test="finalScore != null">final_score,</if>
             <if test="isLeader != null">is_leader,</if>
+            <if test="feedbackReason != null">feedback_reason,</if>
+            <if test="confirmStatus != null">confirm_status,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -74,6 +80,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reviewScore != null">#{reviewScore},</if>
             <if test="finalScore != null">#{finalScore},</if>
             <if test="isLeader != null">#{isLeader},</if>
+            <if test="feedbackReason != null">#{feedbackReason},</if>
+            <if test="confirmStatus != null">#{confirmStatus},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -94,6 +102,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reviewScore != null">review_score = #{reviewScore},</if>
             <if test="finalScore != null">final_score = #{finalScore},</if>
             <if test="isLeader != null">is_leader = #{isLeader},</if>
+            <if test="feedbackReason != null">feedback_reason = #{feedbackReason},</if>
+            <if test="confirmStatus != null">confirm_status = #{confirmStatus},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>

ygtx-gxt/src/main/resources/mapper/gxt/GxtWorkOrderMapper.xml

@@ -63,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="attachmentUrls"    column="attachment_urls"    />
         <result property="itemCompletionFactor"    column="item_completion_factor"    />
         <result property="itemCompletionFactorSum"    column="item_completion_factor_sum"    />
+        <result property="reviewScoreNum"    column="review_score_num"    />
     </resultMap>
 
     <sql id="selectGxtWorkOrderVo">
@@ -73,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                suspend_time,status_before_suspend, modify_reason, pause_reason, pause_time, restart_time, complete_time, plan_hour,
                content, real_content, fault_code, fault_desc, order_type, priority_type, score, review_content, issuer_name,
                permitter_name, scoring_status, t.create_by, t.create_time, t.update_by, t.update_time, t.remark, t.attachment_urls,
-               item_completion_factor, item_completion_factor_sum
+               item_completion_factor, item_completion_factor_sum, review_score_num
         from gxt_work_order t
          left join sys_user u on u.user_name = t.create_by
          left join sys_dept d on u.dept_id = d.dept_id
@@ -93,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scoringStatus != null"> and scoring_status = #{scoringStatus}</if>
             <if test="itemCompletionFactor != null"> and item_completion_factor = #{itemCompletionFactor}</if>
             <if test="itemCompletionFactorSum != null"> and item_completion_factor_sum = #{itemCompletionFactorSum}</if>
+            <if test="reviewScoreNum != null"> and review_score_num = #{reviewScoreNum}</if>
             <!-- 业务特定数据权限过滤条件 -->
             <if test="params.businessDataScope != null and params.businessDataScope != ''">
                 ${params.businessDataScope}
@@ -171,6 +173,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="attachmentUrls != null">attachment_urls,</if>
             <if test="itemCompletionFactor != null">item_completion_factor,</if>
             <if test="itemCompletionFactorSum != null">item_completion_factor_sum,</if>
+            <if test="reviewScoreNum != null">review_score_num,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="workOrderProjectNo != null and workOrderProjectNo != ''">#{workOrderProjectNo},</if>
@@ -229,6 +232,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="attachmentUrls != null">#{attachmentUrls},</if>
             <if test="itemCompletionFactor != null">#{itemCompletionFactor},</if>
             <if test="itemCompletionFactorSum != null">#{itemCompletionFactorSum},</if>
+            <if test="reviewScoreNum != null">#{reviewScoreNum},</if>
          </trim>
     </insert>
 
@@ -291,6 +295,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="attachmentUrls != null">attachment_urls = #{attachmentUrls},</if>
             <if test="itemCompletionFactor != null">item_completion_factor = #{itemCompletionFactor},</if>
             <if test="itemCompletionFactorSum != null">item_completion_factor_sum = #{itemCompletionFactorSum},</if>
+            <if test="reviewScoreNum != null">review_score_num = #{reviewScoreNum},</if>
         </trim>
         where id = #{id}
     </update>
@@ -391,6 +396,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             t1.attachment_urls,
             t1.attachment_file_names,
             t1.attachment_original_names,
+            t1.review_score_num,
             t1.create_by,
             t1.create_time,
             t1.update_by,

ygtx-gxt/src/main/resources/mapper/gxt/GxtWorkOrderPersonMapper.xml

@@ -17,6 +17,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reviewScore"    column="review_score"    />
         <result property="finalScore"    column="final_score"    />
         <result property="isLeader"    column="is_leader"    />
+        <result property="feedbackReason"    column="feedback_reason"    />
+        <result property="confirmStatus"    column="confirm_status"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -25,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectGxtWorkOrderPersonVo">
-        select id, user_id, nick_name, order_id, order_code, status, mis_no, user_name, self_score, review_score, final_score, is_leader, create_by, create_time, update_by, update_time, remark
+        select id, user_id, nick_name, order_id, order_code, status, mis_no, user_name, self_score, review_score, final_score, is_leader, feedback_reason, confirm_status, create_by, create_time, update_by, update_time, remark
         from gxt_work_order_person
     </sql>
 
@@ -42,6 +44,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reviewScore != null "> and review_score = #{reviewScore}</if>
             <if test="finalScore != null "> and final_score = #{finalScore}</if>
             <if test="isLeader != null "> and is_leader = #{isLeader}</if>
+            <if test="feedbackReason != null  and feedbackReason != ''"> and feedback_reason = #{feedbackReason}</if>
+            <if test="confirmStatus != null "> and confirm_status = #{confirmStatus}</if>
         </where>
         order by create_time desc
     </select>
@@ -71,6 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reviewScore != null">review_score,</if>
             <if test="finalScore != null">final_score,</if>
             <if test="isLeader != null">is_leader,</if>
+            <if test="feedbackReason != null">feedback_reason,</if>
+            <if test="confirmStatus != null">confirm_status,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -89,6 +95,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reviewScore != null">#{reviewScore},</if>
             <if test="finalScore != null">#{finalScore},</if>
             <if test="isLeader != null">#{isLeader},</if>
+            <if test="feedbackReason != null">#{feedbackReason},</if>
+            <if test="confirmStatus != null">#{confirmStatus},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -111,6 +119,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reviewScore != null">review_score = #{reviewScore},</if>
             <if test="finalScore != null">final_score = #{finalScore},</if>
             <if test="isLeader != null">is_leader = #{isLeader},</if>
+            <if test="feedbackReason != null">feedback_reason = #{feedbackReason},</if>
+            <if test="confirmStatus != null">confirm_status = #{confirmStatus},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>