1.年度预算修改记录 2.费用申请页面新建 3.年度预算增加查询条件

src/main/java/com/liang/controller/PrjAnnualBudgetRecordController.java

@@ -26,6 +26,8 @@ public class PrjAnnualBudgetRecordController extends BaseController {
 
     @Resource
     private PrjAnnualBudgetRecordService prjAnnualBudgetRecordService;
+    @Resource
+    private  PrjAnnualbudgetdetailService prjAnnualbudgetdetailService;
 
     /**
      * 在年度预算修改记录表中添加修改前的数据（年度预算明细）
@@ -65,10 +67,11 @@ public class PrjAnnualBudgetRecordController extends BaseController {
                              @RequestParam(required = false, defaultValue = "", value = "sortName") String sortName,
                              @RequestParam(required = false, defaultValue = "", value = "sortOrder") String sortOrder) {
         PageHelper.startPage(pageNum, pageSize);
-        List<PrjAnnualBudgetRecord> list = prjAnnualBudgetRecordService.queryRecordByNdysid(xmid);
-        PageInfo<PrjAnnualBudgetRecord> pageinfo = new PageInfo<>(list);
+//        List<PrjAnnualBudgetRecord> list = prjAnnualBudgetRecordService.queryRecordByNdysid(xmid);
+        List<PrjAnnualbudgetdetail> list = prjAnnualbudgetdetailService.getXGJL(xmid);
+        PageInfo<PrjAnnualbudgetdetail> pageinfo = new PageInfo<>(list);
         //取出查询结果
-        List<PrjAnnualBudgetRecord> rows = pageinfo.getList();
+        List<PrjAnnualbudgetdetail> rows = pageinfo.getList();
         int total = (int) pageinfo.getTotal();
         Map<String, Object> result = new HashMap<>();
         result.put(RESULT_ROWS, rows);

src/main/java/com/liang/controller/StaBudgetapprovalController.java

@@ -14,6 +14,7 @@ import com.liang.service.*;
 import io.swagger.annotations.ApiOperation;
 import lombok.Synchronized;
 import jdk.nashorn.internal.runtime.linker.LinkerCallSite;
+import org.apache.poi.hpsf.Decimal;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.http.ResponseEntity;
@@ -231,7 +232,7 @@ public class StaBudgetapprovalController extends BaseController {
     }
 
     /**
-     * 新建数据
+     * 新建数据(年度预算页面)
      *
      * @return
      */
@@ -241,6 +242,26 @@ public class StaBudgetapprovalController extends BaseController {
         model.addAttribute("userInfo", userInfo);
         return "annualbudget/add_apply";
     }
+    /**
+     * 新建数据(费用申请页面)
+     *
+     * @return
+     */
+    @RequestMapping(value = "/forAdd", method = RequestMethod.GET)
+    public String forAdd(Model model) {
+        SysUserInfo userInfo = getSysUserInfo();
+        model.addAttribute("userInfo", userInfo);
+        return "stabudgetapproval/add";
+    }
+
+    @RequestMapping(value = "/init_prjAnnualbudget", method = RequestMethod.GET)
+    public String init_prjAnnualbudget(Model model) {
+        //项目类型
+        List<Map<String, String>> xmlxList = projecttypeService.getXMLX();
+        model.addAttribute("xmlxList", xmlxList);
+
+        return "stabudgetapproval/list_annualbudget";
+    }
 
     /**
      * 保存数据（费用申请）
@@ -1599,5 +1620,20 @@ public class StaBudgetapprovalController extends BaseController {
         String bh = staBudgetapprovalService.getBhById(id);
         return BaseResult.success(bh);
     }
+
+    /**
+     * 获取项目总预算
+     *
+     * @return
+     */
+    @ResponseBody
+    @PostMapping("/getXMZYS/{id}")
+    public BaseResult getXMZYS(@PathVariable String id) {
+        Double xmzys = prjAnnualbudgetdetailService.getXMZYS(id);
+//        select YSJE from prj_AnnualBudgetDetail where NYS = b.NYS and FJ = ''
+        return BaseResult.success(xmzys);
+    }
+
+
 }
 

src/main/java/com/liang/dao/PrjAnnualbudgetdetailDao.java

@@ -134,5 +134,9 @@ public interface PrjAnnualbudgetdetailDao {
     List<PrjAnnualbudgetYzxqkVo> getNf(@Param("nys")Integer nys);
 
     List<PrjAnnualbudgetdetail> listAllBudgetDetail(@Param("nys") Integer nys);
+
+    List<PrjAnnualbudgetdetail> getXGJL(int xmid);
+
+    Double getXMZYS(String id);
 }
 

src/main/java/com/liang/service/PrjAnnualbudgetdetailService.java

@@ -91,4 +91,8 @@ public interface PrjAnnualbudgetdetailService {
     Integer getSubNodeCount(@Param("nys") Integer nys, @Param("page") Integer page, @Param("limit") Integer limit);
 
     List<PrjAnnualbudgetdetail> listAllBudgetDetail(@Param("nys") Integer nys);
+
+    List<PrjAnnualbudgetdetail> getXGJL(int xmid);
+
+    Double getXMZYS(String id);
 }

src/main/java/com/liang/service/impl/PrjAnnualbudgetdetailServiceImpl.java

@@ -234,4 +234,16 @@ public class PrjAnnualbudgetdetailServiceImpl implements PrjAnnualbudgetdetailSe
         return this.prjAnnualbudgetdetailDao.listAllBudgetDetail(nys);
     }
 
+    @Override
+    public List<PrjAnnualbudgetdetail> getXGJL(int xmid) {
+        return this.prjAnnualbudgetdetailDao.getXGJL(xmid);
+    }
+
+    @Override
+    public Double getXMZYS(String id) {
+        Double xmzys = prjAnnualbudgetdetailDao.getXMZYS(id);
+        System.out.println("xmzys = " + xmzys);
+        return xmzys;
+    }
+
 }

src/main/resources/mapper/PrjAnnualbudgetDao.xml

@@ -372,6 +372,9 @@
         <if test="nf != null and nf != ''">
             and a.NF = #{nf}
         </if>
+        <if test="add != null and add != ''">
+            and a.SPZT = '审批结束'
+        </if>
         <choose>
             <when test="sortName != null and sortName != '' and sortOrder != null and sortOrder != ''">
                 order by ${sortName} ${sortOrder}

src/main/resources/mapper/PrjAnnualbudgetdetailDao.xml

@@ -655,5 +655,17 @@
         where
            nys in (select  ID from prj_AnnualBudget where rws = (select  rws from prj_AnnualBudget where id = #{nys}))
     </select>
+    <select id="getXGJL" resultType="com.liang.entity.PrjAnnualbudgetdetail">
+        select a.fymc,a.xmzys,a.ysje,b.nf
+        from
+            prj_AnnualBudgetDetail  a
+        left join prj_AnnualBudget b on  a.NYS = b.id
+        where
+            NYS =#{xmid}
+    </select>
+    <select id="getXMZYS" resultType="java.lang.Double">
+        select YSJE from prj_AnnualBudgetDetail where NYS = #{id} and FJ = ''
+    </select>
+
 </mapper>
 

src/main/resources/templates/annualbudget/view_record.html

@@ -55,17 +55,16 @@
                 [
                     {type: 'numbers', align: 'center'},
                     {field: 'fymc', width: '20%', title: '费用名称'},
+                    {field: 'nf', width: '10%', title: '年份'},
                     {field: 'xmzys', width: '20%', title: '项目总预算'},
-                    {field: 'ysje', width: '10%', title: '预算金额', align: 'center'},
-                    {field: 'xmz', width: '10%', title: '项目组', align: 'center'},
-                    {field: 'byj', width: '10%', title: '备用金', align: 'center'},
-                    {field: 'bjsj', width: '15%', title: '编辑时间', align: 'center'}
+                    {field: 'sptgysje', width: '20%', title: '审批通过状态'},
+                    {field: 'ysje', width: '20%', title: '现在'},
                 ]
             ],
             sortName: 'jtsj',
             autoSort: false,
-            limits: [10, 15, 20, 25, 50, 100],
-            limit: 10,
+            limits: [20, 25, 50, 100],
+            limit: 30,
             page: true,
             skin: 'grid',
             parseData: function (res) { //res 即为原始返回的数据