|
|
@@ -318,7 +318,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
group by t.taskType
|
|
|
</select>
|
|
|
|
|
|
- <select id="getInfoByTaskId" parameterType="String" resultType="FmsTaskResVo">
|
|
|
+ <select id="selectInfoByTaskId" parameterType="String" resultType="FmsTaskResVo">
|
|
|
select t.*, c.cropName, c.cropType, l.landName, b.blockName, p.planNo, p.planArea, u.userName taskCreatorName
|
|
|
from FmsTask t
|
|
|
LEFT JOIN FmsCrop c on t.cropId = c.cropId
|
|
|
@@ -503,9 +503,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
IFNULL(sum(tb1.taskrcdMachineInvestment),0) njSum,
|
|
|
l.landId, l.landName
|
|
|
from FmsTask t
|
|
|
- left join
|
|
|
- (select tr.* from FmsTaskrcd tr where tr.taskrcdAuditstatus = '2') tb1
|
|
|
- on tb1.taskId = t.taskId
|
|
|
+ left join (select tr.* from FmsTaskrcd tr where tr.taskrcdAuditstatus = '2') tb1 on tb1.taskId = t.taskId
|
|
|
left join FmsLand l on l.landId = t.landId
|
|
|
where left(t.taskCompletedate,4)=#{startTime} and t.tid = #{tid}
|
|
|
<if test="landId != null and landId != ''"> and t.landId = #{landId}</if>
|
