浏览代码

年度预算、任务书字段调整、登录页面地址调整

ly 1 年之前
父节点
当前提交
8f3197bb49

+ 1 - 1
src/main/java/com/liang/controller/PrjProjectController.java

@@ -349,7 +349,7 @@ public class PrjProjectController extends BaseController {
349 349
         PrjProject rws = JsonTool.parseObject(strData, PrjProject.class);
350 350
         int num = prjProjectService.updateSpzt(rws);
351 351
 
352
-        //审批结束时 更新任务书预算
352
+        //审批结束时 更新年度预算
353 353
         if (StringUtils.isNotBlank(rws.getSpzt())
354 354
                 && "审批结束".equals(rws.getSpzt())) {
355 355
             prjProjectService.updatePrj_AnnualBudgetDetail(rws.getId());

+ 2 - 2
src/main/resources/mapper/PrjAnnualbudgetdetailDao.xml

@@ -440,7 +440,7 @@
440 440
     <update id="updateRWSYS">
441 441
 
442 442
         update A
443
-        set A.RWSYS = B.DW from prj_AnnualBudgetDetail A
443
+        set A.XMZYS = B.DW from prj_AnnualBudgetDetail A
444 444
             inner join (SELECT MC, ${DW} as DW
445 445
           , YSJE from prj_Budget where XM = #{id}) B
446 446
         on A.FYMC = B.MC
@@ -474,7 +474,7 @@
474 474
     </update>
475 475
     <update id="updateWWYJZCFSUM">
476 476
         update prj_AnnualBudgetDetail
477
-        set RWSYS = (SELECT sum(RWSYS)
477
+        set XMZYS = (SELECT sum(RWSYS)
478 478
                      from prj_AnnualBudgetDetail
479 479
                      where NYS = (SELECT ID from prj_AnnualBudget where RWS = #{id})
480 480
                        and (FYMC = '1.外委研究支出费' or FYMC = '2.仪器设备租赁费' or FYMC = '3.外协测试试验与加工费'))

+ 1 - 1
src/main/resources/templates/login/login.html

@@ -489,7 +489,7 @@
489 489
         });
490 490
 
491 491
         function redirection(){
492
-            window.location.replace("http://10.208.114.107:8081/home/")
492
+            window.location.replace("http://10.208.114.107:8081/home/index")
493 493
         }
494 494
         // 登陆中
495 495
         function logining() {