|
@@ -51,12 +51,12 @@
|
|
a.project_type as "projectType",
|
|
a.project_type as "projectType",
|
|
a.over_due_status as "overDueStatus"
|
|
a.over_due_status as "overDueStatus"
|
|
</sql>
|
|
</sql>
|
|
-
|
|
|
|
|
|
+
|
|
<sql id="projectRecordsJoins">
|
|
<sql id="projectRecordsJoins">
|
|
LEFT JOIN sys_area area ON area.id = a.area_id
|
|
LEFT JOIN sys_area area ON area.id = a.area_id
|
|
</sql>
|
|
</sql>
|
|
-
|
|
|
|
-
|
|
|
|
|
|
+
|
|
|
|
+
|
|
<select id="get" resultType="ProjectRecords" >
|
|
<select id="get" resultType="ProjectRecords" >
|
|
SELECT
|
|
SELECT
|
|
<include refid="projectRecordsColumns"/>
|
|
<include refid="projectRecordsColumns"/>
|
|
@@ -83,7 +83,7 @@
|
|
left join project_report_data prd on a.id = prd.project_id
|
|
left join project_report_data prd on a.id = prd.project_id
|
|
WHERE a.id = #{id}
|
|
WHERE a.id = #{id}
|
|
</select>
|
|
</select>
|
|
-
|
|
|
|
|
|
+
|
|
<select id="findList" resultType="ProjectRecords" >
|
|
<select id="findList" resultType="ProjectRecords" >
|
|
SELECT
|
|
SELECT
|
|
<include refid="projectRecordsColumns"/>
|
|
<include refid="projectRecordsColumns"/>
|
|
@@ -343,15 +343,15 @@
|
|
AND a.del_flag = #{DEL_FLAG_NORMAL}
|
|
AND a.del_flag = #{DEL_FLAG_NORMAL}
|
|
</where>
|
|
</where>
|
|
</select>
|
|
</select>
|
|
-
|
|
|
|
|
|
+
|
|
<select id="findAllList" resultType="ProjectRecords" >
|
|
<select id="findAllList" resultType="ProjectRecords" >
|
|
- SELECT
|
|
|
|
|
|
+ SELECT
|
|
<include refid="projectRecordsColumns"/>
|
|
<include refid="projectRecordsColumns"/>
|
|
FROM project_records a
|
|
FROM project_records a
|
|
<include refid="projectRecordsJoins"/>
|
|
<include refid="projectRecordsJoins"/>
|
|
<where>
|
|
<where>
|
|
a.del_flag = #{DEL_FLAG_NORMAL}
|
|
a.del_flag = #{DEL_FLAG_NORMAL}
|
|
- </where>
|
|
|
|
|
|
+ </where>
|
|
<choose>
|
|
<choose>
|
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
|
ORDER BY ${page.orderBy}
|
|
ORDER BY ${page.orderBy}
|
|
@@ -496,18 +496,18 @@
|
|
construction_linkman = #{constructionLinkman}
|
|
construction_linkman = #{constructionLinkman}
|
|
WHERE id = #{id}
|
|
WHERE id = #{id}
|
|
</update>
|
|
</update>
|
|
-
|
|
|
|
-
|
|
|
|
|
|
+
|
|
|
|
+
|
|
<!--物理删除-->
|
|
<!--物理删除-->
|
|
<update id="delete">
|
|
<update id="delete">
|
|
UPDATE project_records SET
|
|
UPDATE project_records SET
|
|
del_flag = #{DEL_FLAG_DELETE}
|
|
del_flag = #{DEL_FLAG_DELETE}
|
|
WHERE id = #{id}
|
|
WHERE id = #{id}
|
|
</update>
|
|
</update>
|
|
-
|
|
|
|
|
|
+
|
|
<!--逻辑删除-->
|
|
<!--逻辑删除-->
|
|
<update id="deleteByLogic">
|
|
<update id="deleteByLogic">
|
|
- UPDATE project_records SET
|
|
|
|
|
|
+ UPDATE project_records SET
|
|
del_flag = #{DEL_FLAG_DELETE}
|
|
del_flag = #{DEL_FLAG_DELETE}
|
|
WHERE id = #{id}
|
|
WHERE id = #{id}
|
|
</update>
|
|
</update>
|
|
@@ -535,7 +535,7 @@
|
|
status = #{projectStatus}
|
|
status = #{projectStatus}
|
|
WHERE id = #{id}
|
|
WHERE id = #{id}
|
|
</update>
|
|
</update>
|
|
-
|
|
|
|
|
|
+
|
|
<update id="updateSelectiveById">
|
|
<update id="updateSelectiveById">
|
|
UPDATE rural_project_records
|
|
UPDATE rural_project_records
|
|
<set>
|
|
<set>
|
|
@@ -735,7 +735,7 @@
|
|
LEFT JOIN sys_office o ON o.id = a.office_id
|
|
LEFT JOIN sys_office o ON o.id = a.office_id
|
|
LEFT JOIN project_report_data prd ON a.id = prd.project_id
|
|
LEFT JOIN project_report_data prd ON a.id = prd.project_id
|
|
where a.status='5' and a.del_flag='0' and w.del_flag='0'
|
|
where a.status='5' and a.del_flag='0' and w.del_flag='0'
|
|
- and prd.number is not null
|
|
|
|
|
|
+ /*and prd.number is not null*/
|
|
and wci.del_flag='0' and (wci.completion_status!='5' or wci.completion_status is null)
|
|
and wci.del_flag='0' and (wci.completion_status!='5' or wci.completion_status is null)
|
|
<if test="projectName != null and projectName != ''">
|
|
<if test="projectName != null and projectName != ''">
|
|
AND a.project_name like concat(concat('%',#{projectName}),'%')
|
|
AND a.project_name like concat(concat('%',#{projectName}),'%')
|
|
@@ -1361,4 +1361,4 @@
|
|
</otherwise>
|
|
</otherwise>
|
|
</choose>
|
|
</choose>
|
|
</select>
|
|
</select>
|
|
-</mapper>
|
|
|
|
|
|
+</mapper>
|