|
|
@@ -900,25 +900,25 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="getProjectReportedListByAdvent" resultType="com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords" >
|
|
|
- SELECT
|
|
|
- <include refid="projectRecordsColumns"/>
|
|
|
- ,date_add(date_format(prd.update_date, '%Y-%m-%d'),interval 30 day) as adventDate
|
|
|
- ,a.project_type as "projectType"
|
|
|
- FROM rural_project_records a
|
|
|
- left join work_contract_info wci on a.contract_id = wci.id
|
|
|
- left join project_report_data prd on prd.project_id = a.id
|
|
|
- left join rural_project_report_record prr on prr.report_id = prd.id
|
|
|
- left join sys_user u on u.id = a.create_by
|
|
|
- left join sys_office o on o.id = a.office_id
|
|
|
- LEFT JOIN sys_area area ON area.id = a.area_id
|
|
|
- LEFT JOIN work_project_user w1 on a.id = w1.project_id
|
|
|
- left join sys_user su on su.id = w1.user_id
|
|
|
- left join sys_office so on so.id = su.office_id
|
|
|
- <where>
|
|
|
- a.del_flag = 0
|
|
|
- and (a.reported_state!=5 or a.reported_state is null)
|
|
|
- and prd.status = 5
|
|
|
- and now() between date_add(prd.update_date,interval #{startCount} day) and date_add(prd.update_date,interval #{endingCount} day)
|
|
|
- </where>
|
|
|
+ SELECT
|
|
|
+ <include refid="projectRecordsColumns"/>
|
|
|
+ ,date_add(date_format(prd.update_date, '%Y-%m-%d'),interval #{endingCount} day) as adventDate
|
|
|
+ ,a.project_type as "projectType"
|
|
|
+ FROM rural_project_records a
|
|
|
+ left join work_contract_info wci on a.contract_id = wci.id
|
|
|
+ left join project_report_data prd on prd.project_id = a.id
|
|
|
+ left join rural_project_report_record prr on prr.report_id = prd.id
|
|
|
+ left join sys_user u on u.id = a.create_by
|
|
|
+ left join sys_office o on o.id = a.office_id
|
|
|
+ LEFT JOIN sys_area area ON area.id = a.area_id
|
|
|
+ LEFT JOIN work_project_user w1 on a.id = w1.project_id
|
|
|
+ left join sys_user su on su.id = w1.user_id
|
|
|
+ left join sys_office so on so.id = su.office_id
|
|
|
+ <where>
|
|
|
+ a.del_flag = 0
|
|
|
+ and (a.reported_state!=5 or a.reported_state is null)
|
|
|
+ and prd.status = 5
|
|
|
+ and now() between date_add(prd.update_date,interval #{startCount} day) and date_add(prd.update_date,interval #{endingCount} day)
|
|
|
+ </where>
|
|
|
</select>
|
|
|
</mapper>
|
user5