|
|
@@ -9,11 +9,14 @@
|
|
|
<result property="endTime" column="end_time" jdbcType="TIMESTAMP"/>
|
|
|
<result property="depName" column="dep_name" jdbcType="VARCHAR"/>
|
|
|
<result property="yearFeature" column="year_feature" jdbcType="VARCHAR"/>
|
|
|
+ <result property="inspectWay" column="inspect_way" jdbcType="INTEGER"/>
|
|
|
<result property="type" column="type" jdbcType="INTEGER"/>
|
|
|
- <result property="inspectionItems" column="inspection_items" jdbcType="VARCHAR"/>
|
|
|
+ <result property="typeOther" column="type_other" jdbcType="VARCHAR"/>
|
|
|
+ <result property="inspectionItems" column="inspection_items" jdbcType="INTEGER"/>
|
|
|
+ <result property="inspectionItemsOther" column="inspection_items_other" jdbcType="VARCHAR"/>
|
|
|
<result property="enterpriseProblems" column="enterprise_problems" jdbcType="VARCHAR"/>
|
|
|
<result property="solution" column="solution" jdbcType="VARCHAR"/>
|
|
|
- <result property="inspectionConclusion" column="inspection_conclusion" jdbcType="VARCHAR"/>
|
|
|
+ <result property="inspectionConclusion" column="inspection_conclusion" jdbcType="INTEGER"/>
|
|
|
<result property="remindFollow" column="remind_follow" jdbcType="VARCHAR"/>
|
|
|
<result property="remarks" column="remarks" jdbcType="VARCHAR"/>
|
|
|
<result property="aid" column="aid" jdbcType="VARCHAR"/>
|
|
|
@@ -22,7 +25,7 @@
|
|
|
</resultMap>
|
|
|
|
|
|
<sql id="TaskFeatureLogAllSql">
|
|
|
-id, tdl_id, start_time, end_time, dep_name, year_feature, type, inspection_items, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, aid, aname, create_time
|
|
|
+id, tdl_id, start_time, end_time, dep_name, year_feature, inspect_way, type, type_other, inspection_items, inspection_items_other, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, aid, aname, create_time
|
|
|
</sql>
|
|
|
|
|
|
<!--查询单个-->
|
|
|
@@ -35,23 +38,23 @@ id, tdl_id, start_time, end_time, dep_name, year_feature, type, inspection_items
|
|
|
|
|
|
<!--新增所有列-->
|
|
|
<insert id="insert" keyProperty="id" useGeneratedKeys="true">
|
|
|
- insert into task_feature_log(tdl_id, start_time, end_time, dep_name, year_feature, type, inspection_items, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, aid, aname, create_time)
|
|
|
- values (#{tdlId}, #{startTime}, #{endTime}, #{depName}, #{yearFeature}, #{type}, #{inspectionItems}, #{enterpriseProblems}, #{solution}, #{inspectionConclusion}, #{remindFollow}, #{remarks}, #{aid}, #{aname}, #{createTime})
|
|
|
+ insert into task_feature_log(tdl_id, start_time, end_time, dep_name, year_feature, inspect_way, type, type_other, inspection_items, inspection_items_other, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, aid, aname, create_time)
|
|
|
+ values (#{tdlId}, #{startTime}, #{endTime}, #{depName}, #{yearFeature}, #{inspectWay}, #{type}, #{typeOther}, #{inspectionItems}, #{inspectionItemsOther}, #{enterpriseProblems}, #{solution}, #{inspectionConclusion}, #{remindFollow}, #{remarks}, #{aid}, #{aname}, #{createTime})
|
|
|
</insert>
|
|
|
|
|
|
<insert id="insertBatch">
|
|
|
- insert into task_feature_log(tdl_id, start_time, end_time, dep_name, year_feature, type, inspection_items, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, aid, aname, create_time)
|
|
|
+ insert into task_feature_log(tdl_id, start_time, end_time, dep_name, year_feature, inspect_way, type, type_other, inspection_items, inspection_items_other, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, aid, aname, create_time)
|
|
|
values
|
|
|
<foreach collection="entities" item="entity" separator=",">
|
|
|
- (#{entity.tdlId}, #{entity.startTime}, #{entity.endTime}, #{entity.depName}, #{entity.yearFeature}, #{entity.type}, #{entity.inspectionItems}, #{entity.enterpriseProblems}, #{entity.solution}, #{entity.inspectionConclusion}, #{entity.remindFollow}, #{entity.remarks}, #{entity.aid}, #{entity.aname}, #{entity.createTime})
|
|
|
+ (#{entity.tdlId}, #{entity.startTime}, #{entity.endTime}, #{entity.depName}, #{entity.yearFeature}, #{entity.inspectWay}, #{entity.type}, #{entity.typeOther}, #{entity.inspectionItems}, #{entity.inspectionItemsOther}, #{entity.enterpriseProblems}, #{entity.solution}, #{entity.inspectionConclusion}, #{entity.remindFollow}, #{entity.remarks}, #{entity.aid}, #{entity.aname}, #{entity.createTime})
|
|
|
</foreach>
|
|
|
</insert>
|
|
|
|
|
|
<insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
|
|
|
- insert into task_feature_log(tdl_id, start_time, end_time, dep_name, year_feature, type, inspection_items, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, aid, aname, create_time)
|
|
|
+ insert into task_feature_log(tdl_id, start_time, end_time, dep_name, year_feature, inspect_way, type, type_other, inspection_items, inspection_items_other, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, aid, aname, create_time)
|
|
|
values
|
|
|
<foreach collection="entities" item="entity" separator=",">
|
|
|
- (#{entity.tdlId}, #{entity.startTime}, #{entity.endTime}, #{entity.depName}, #{entity.yearFeature}, #{entity.type}, #{entity.inspectionItems}, #{entity.enterpriseProblems}, #{entity.solution}, #{entity.inspectionConclusion}, #{entity.remindFollow}, #{entity.remarks}, #{entity.aid}, #{entity.aname}, #{entity.createTime})
|
|
|
+ (#{entity.tdlId}, #{entity.startTime}, #{entity.endTime}, #{entity.depName}, #{entity.yearFeature}, #{entity.inspectWay}, #{entity.type}, #{entity.typeOther}, #{entity.inspectionItems}, #{entity.inspectionItemsOther}, #{entity.enterpriseProblems}, #{entity.solution}, #{entity.inspectionConclusion}, #{entity.remindFollow}, #{entity.remarks}, #{entity.aid}, #{entity.aname}, #{entity.createTime})
|
|
|
</foreach>
|
|
|
on duplicate key update
|
|
|
tdl_id = values(tdl_id),
|
|
|
@@ -59,8 +62,11 @@ start_time = values(start_time),
|
|
|
end_time = values(end_time),
|
|
|
dep_name = values(dep_name),
|
|
|
year_feature = values(year_feature),
|
|
|
+inspect_way = values(inspect_way),
|
|
|
type = values(type),
|
|
|
+type_other = values(type_other),
|
|
|
inspection_items = values(inspection_items),
|
|
|
+inspection_items_other = values(inspection_items_other),
|
|
|
enterprise_problems = values(enterprise_problems),
|
|
|
solution = values(solution),
|
|
|
inspection_conclusion = values(inspection_conclusion),
|
|
|
@@ -90,19 +96,28 @@ create_time = values(create_time)
|
|
|
<if test="yearFeature != null and yearFeature != ''">
|
|
|
year_feature = #{yearFeature},
|
|
|
</if>
|
|
|
+ <if test="inspectWay != null">
|
|
|
+ inspect_way = #{inspectWay},
|
|
|
+ </if>
|
|
|
<if test="type != null">
|
|
|
type = #{type},
|
|
|
</if>
|
|
|
- <if test="inspectionItems != null and inspectionItems != ''">
|
|
|
+ <if test="typeOther != null and typeOther != ''">
|
|
|
+ type_other = #{typeOther},
|
|
|
+ </if>
|
|
|
+ <if test="inspectionItems != null">
|
|
|
inspection_items = #{inspectionItems},
|
|
|
</if>
|
|
|
+ <if test="inspectionItemsOther != null and inspectionItemsOther != ''">
|
|
|
+ inspection_items_other = #{inspectionItemsOther},
|
|
|
+ </if>
|
|
|
<if test="enterpriseProblems != null and enterpriseProblems != ''">
|
|
|
enterprise_problems = #{enterpriseProblems},
|
|
|
</if>
|
|
|
<if test="solution != null and solution != ''">
|
|
|
solution = #{solution},
|
|
|
</if>
|
|
|
- <if test="inspectionConclusion != null and inspectionConclusion != ''">
|
|
|
+ <if test="inspectionConclusion != null">
|
|
|
inspection_conclusion = #{inspectionConclusion},
|
|
|
</if>
|
|
|
<if test="remindFollow != null and remindFollow != ''">
|
|
|
@@ -149,19 +164,28 @@ create_time = values(create_time)
|
|
|
<if test="yearFeature != null and yearFeature != ''">
|
|
|
and year_feature = #{yearFeature}
|
|
|
</if>
|
|
|
+ <if test="inspectWay != null">
|
|
|
+ and inspect_way = #{inspectWay}
|
|
|
+ </if>
|
|
|
<if test="type != null">
|
|
|
and type = #{type}
|
|
|
</if>
|
|
|
- <if test="inspectionItems != null and inspectionItems != ''">
|
|
|
+ <if test="typeOther != null and typeOther != ''">
|
|
|
+ and type_other = #{typeOther}
|
|
|
+ </if>
|
|
|
+ <if test="inspectionItems != null">
|
|
|
and inspection_items = #{inspectionItems}
|
|
|
</if>
|
|
|
+ <if test="inspectionItemsOther != null and inspectionItemsOther != ''">
|
|
|
+ and inspection_items_other = #{inspectionItemsOther}
|
|
|
+ </if>
|
|
|
<if test="enterpriseProblems != null and enterpriseProblems != ''">
|
|
|
and enterprise_problems = #{enterpriseProblems}
|
|
|
</if>
|
|
|
<if test="solution != null and solution != ''">
|
|
|
and solution = #{solution}
|
|
|
</if>
|
|
|
- <if test="inspectionConclusion != null and inspectionConclusion != ''">
|
|
|
+ <if test="inspectionConclusion != null">
|
|
|
and inspection_conclusion = #{inspectionConclusion}
|
|
|
</if>
|
|
|
<if test="remindFollow != null and remindFollow != ''">
|
|
|
@@ -208,19 +232,28 @@ create_time = values(create_time)
|
|
|
<if test="yearFeature != null and yearFeature != ''">
|
|
|
and year_feature = #{yearFeature}
|
|
|
</if>
|
|
|
+ <if test="inspectWay != null">
|
|
|
+ and inspect_way = #{inspectWay}
|
|
|
+ </if>
|
|
|
<if test="type != null">
|
|
|
and type = #{type}
|
|
|
</if>
|
|
|
- <if test="inspectionItems != null and inspectionItems != ''">
|
|
|
+ <if test="typeOther != null and typeOther != ''">
|
|
|
+ and type_other = #{typeOther}
|
|
|
+ </if>
|
|
|
+ <if test="inspectionItems != null">
|
|
|
and inspection_items = #{inspectionItems}
|
|
|
</if>
|
|
|
+ <if test="inspectionItemsOther != null and inspectionItemsOther != ''">
|
|
|
+ and inspection_items_other = #{inspectionItemsOther}
|
|
|
+ </if>
|
|
|
<if test="enterpriseProblems != null and enterpriseProblems != ''">
|
|
|
and enterprise_problems = #{enterpriseProblems}
|
|
|
</if>
|
|
|
<if test="solution != null and solution != ''">
|
|
|
and solution = #{solution}
|
|
|
</if>
|
|
|
- <if test="inspectionConclusion != null and inspectionConclusion != ''">
|
|
|
+ <if test="inspectionConclusion != null">
|
|
|
and inspection_conclusion = #{inspectionConclusion}
|
|
|
</if>
|
|
|
<if test="remindFollow != null and remindFollow != ''">
|