|
@@ -440,13 +440,13 @@
|
440
|
440
|
<update id="updateRWSYS">
|
441
|
441
|
|
442
|
442
|
update A
|
443
|
|
- set A.RWSYS = B.DW
|
444
|
|
- from prj_AnnualBudgetDetail A
|
445
|
|
- inner join (SELECT MC, ${DW} as DW, YSJE from prj_Budget where XM = #{id}) B
|
|
443
|
+ set A.RWSYS = B.DW from prj_AnnualBudgetDetail A
|
|
444
|
+ inner join (SELECT MC, ${DW} as DW
|
|
445
|
+ , YSJE from prj_Budget where XM = #{id}) B
|
446
|
446
|
on A.FYMC = B.MC
|
447
|
447
|
where
|
448
|
448
|
NYS = (SELECT ID from prj_AnnualBudget where RWS = #{id})
|
449
|
|
- and (A.FYMC != '1.外委研究支出费' )
|
|
449
|
+ and A.FYMC != '1.外委研究支出费' and A.FYMC != '总计'
|
450
|
450
|
</update>
|
451
|
451
|
<update id="updateWWYJZCF">
|
452
|
452
|
|
|
@@ -459,7 +459,8 @@
|
459
|
459
|
</update>
|
460
|
460
|
<update id="updateXMZYS">
|
461
|
461
|
update prj_AnnualBudgetDetail
|
462
|
|
- set XMZYS = #{rwsys}
|
|
462
|
+ set XMZYS = #{rwsys},
|
|
463
|
+ rwsys = #{rwsys}
|
463
|
464
|
where NYS = (SELECT ID from prj_AnnualBudget where RWS = #{id})
|
464
|
465
|
and FYMC = '总计'
|
465
|
466
|
</update>
|
|
@@ -467,7 +468,7 @@
|
467
|
468
|
update prj_AnnualBudgetDetail
|
468
|
469
|
set YSJE = null
|
469
|
470
|
where NYS = (SELECT ID from prj_AnnualBudget where RWS = #{id})
|
470
|
|
- and (FYMC != '1.外委研究支出费' or FYMC != '总计')
|
|
471
|
+ and FYMC != '1.外委研究支出费' and FYMC != '总计'
|
471
|
472
|
|
472
|
473
|
</update>
|
473
|
474
|
<update id="updateWWYJZCFSUM">
|