Merge remote-tracking branch 'origin/master'

cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentPartyAffairs.java

@@ -53,6 +53,16 @@ public class TAmentPartyAffairs extends BaseEntity
 
     private String shotName;
 
+    private String examineType;
+
+    public String getExamineType() {
+        return examineType;
+    }
+
+    public void setExamineType(String examineType) {
+        this.examineType = examineType;
+    }
+
     private String selectDate;
 
     public String getSelectDate() {
@@ -381,6 +391,7 @@ public class TAmentPartyAffairs extends BaseEntity
             .append("id", getId())
             .append("type", getType())
             .append("unit", getUnit())
+            .append("examineType", getExamineType())
             .append("target", getTarget())
             .append("demand", getDemand())
             .append("detailed", getDetailed())

cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="unit"    column="unit"    />
         <result property="target"    column="target"    />
         <result property="shotName"    column="shot_name"    />
+        <result property="examineType"    column="examine_type"    />
         <result property="status"    column="status"    />
         <result property="demand"    column="demand"    />
         <result property="detailed"    column="detailed"    />
@@ -32,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTAmentPartyAffairsVo">
-        select id, type,shot_name ,files, unit, target, status, demand, detailed, degree, score,now_score, method, head, reviewed, finish_date, per_id, dept_id, branch_id, create_by, create_time, update_by, update_time, remark from t_ament_party_affairs
+        select id, type,shot_name ,examine_type ,files, unit, target, status, demand, detailed, degree, score,now_score, method, head, reviewed, finish_date, per_id, dept_id, branch_id, create_by, create_time, update_by, update_time, remark from t_ament_party_affairs
     </sql>
 
     <select id="selectTAmentPartyAffairsList" parameterType="TAmentPartyAffairs" resultMap="TAmentPartyAffairsResult">
@@ -373,6 +374,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="type != null and type != ''">type,</if>
             <if test="unit != null">unit,</if>
+            <if test="examineType != null">examine_type,</if>
             <if test="target != null">target,</if>
             <if test="shotName != null">shot_name,</if>
             <if test="demand != null">demand,</if>
@@ -396,6 +398,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="type != null and type != ''">#{type},</if>
             <if test="unit != null">#{unit},</if>
+            <if test="examineType != null">#{examineType},</if>
             <if test="target != null">#{target},</if>
             <if test="shotName != null">#{shotName},</if>
             <if test="demand != null">#{demand},</if>
@@ -424,6 +427,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="type != null and type != ''">type = #{type},</if>
             <if test="shotName != null and shotName != ''">shot_name = #{shotName},</if>
             <if test="unit != null">unit = #{unit},</if>
+            <if test="examineType != null">examineType = #{examine_type},</if>
             <if test="target != null">target = #{target},</if>
             <if test="demand != null">demand = #{demand},</if>
             <if test="detailed != null">detailed = #{detailed},</if>