Browse Source

update 乐团巡查加,乐团主管名字

周箭河 4 years ago
parent
commit
8a5ff800ef

+ 4 - 4
mec-biz/src/main/resources/config/mybatis/InspectionItemMapper.xml

@@ -11,7 +11,7 @@
         <result column="item_" property="item" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="item_" property="item" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="times_" property="times"/>
         <result column="times_" property="times"/>
         <result column="planned_times_" property="plannedTimes"/>
         <result column="planned_times_" property="plannedTimes"/>
-        <result column="submitted_times" property="submittedTimes"/>
+        <result column="submitted_times_" property="submittedTimes"/>
         <result column="memo_" property="memo"/>
         <result column="memo_" property="memo"/>
         <result column="operation_" property="operation"/>
         <result column="operation_" property="operation"/>
         <result column="create_time_" property="createTime"/>
         <result column="create_time_" property="createTime"/>
@@ -22,7 +22,7 @@
     </resultMap>
     </resultMap>
     <sql id="Base_Column_List">
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
         <!--@mbg.generated-->
-        id_, inspection_id_, organ_id_, user_id_, item_, times_, planned_times_, submitted_times,
+        id_, inspection_id_, organ_id_, user_id_, item_, times_, planned_times_, submitted_times_,
         memo_, operation_, create_time_, update_time_
         memo_, operation_, create_time_, update_time_
     </sql>
     </sql>
     <select id="get" parameterType="java.lang.Long" resultMap="InspectionItem">
     <select id="get" parameterType="java.lang.Long" resultMap="InspectionItem">
@@ -41,7 +41,7 @@
             useGeneratedKeys="true">
             useGeneratedKeys="true">
         <!--@mbg.generated-->
         <!--@mbg.generated-->
         insert into inspection_item (inspection_id_, organ_id_, user_id_, item_, times_, planned_times_,
         insert into inspection_item (inspection_id_, organ_id_, user_id_, item_, times_, planned_times_,
-        submitted_times, memo_, operation_, create_time_, update_time_)
+        submitted_times_, memo_, operation_, create_time_, update_time_)
         values (#{inspectionId}, #{organId}, #{userId}, #{item,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         values (#{inspectionId}, #{organId}, #{userId}, #{item,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{times}, #{plannedTimes},
         #{times}, #{plannedTimes},
         #{submittedTimes}, #{memo}, #{operation}, #{createTime}, #{updateTime})
         #{submittedTimes}, #{memo}, #{operation}, #{createTime}, #{updateTime})
@@ -69,7 +69,7 @@
                 planned_times_ = #{plannedTimes},
                 planned_times_ = #{plannedTimes},
             </if>
             </if>
             <if test="submittedTimes != null">
             <if test="submittedTimes != null">
-                submitted_times = #{submittedTimes},
+                submitted_times_ = #{submittedTimes},
             </if>
             </if>
             <if test="memo != null">
             <if test="memo != null">
                 memo_ = #{memo},
                 memo_ = #{memo},

+ 2 - 1
mec-biz/src/main/resources/config/mybatis/InspectionMapper.xml

@@ -106,7 +106,8 @@
     </sql>
     </sql>
     <select id="getInfo" resultMap="Inspection">
     <select id="getInfo" resultMap="Inspection">
         SELECT i.*,ii.id_ ie_id_,ii.inspection_id_ ie_inspection_id_,ii.organ_id_ ie_organ_id_,ii.user_id_ ie_user_id_,
         SELECT i.*,ii.id_ ie_id_,ii.inspection_id_ ie_inspection_id_,ii.organ_id_ ie_organ_id_,ii.user_id_ ie_user_id_,
-        ii.item_ ie_item_,ii.times_ ie_times_,ii.planned_times_ ie_planned_times_,
+        ii.item_ ie_item_,ii.times_ ie_times_,ii.planned_times_ ie_planned_times_,ii.submitted_times_ ie_submitted_times_,
+        ii.memo_ ie_memo_,ii.operation_ ie_operation_,ii.create_time_ ie_create_time_,ii.update_time_ ie_update_time_,
         o.name_ organName,su.real_name_ userName FROM inspection i
         o.name_ organName,su.real_name_ userName FROM inspection i
         LEFT JOIN organization o ON o.id_ = i.organ_id_
         LEFT JOIN organization o ON o.id_ = i.organ_id_
         LEFT JOIN sys_user su ON su.id_ = i.user_id_
         LEFT JOIN sys_user su ON su.id_ = i.user_id_