Merge remote-tracking branch 'origin/master'

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/controller/ProjectCostHuijiController.java

@@ -526,7 +526,7 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
     */
     @AutoLog(value = "项目成本汇集表-添加到成本模型中")
     @ApiOperation(value = "项目成本汇集表-添加到成本模型中", notes = "项目成本汇集表-添加到成本模型中")
-    @RequestMapping(value = "/insertIntoCostModel", method = RequestMethod.POST)
+    @PostMapping(value = "/insertIntoCostModel")
     public Result<String> insertIntoCostModel(@RequestBody List<ProjectCostHuiji> projectCostHuijis){
         Boolean b = projectCostHuijiService.insertIntoCostModel(projectCostHuijis);
         if ( b ){

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/convert/impl/ProjectCostHuijiConverCustomImpl.java

@@ -135,6 +135,7 @@ public class ProjectCostHuijiConverCustomImpl implements ProjectCostHuijiCustomC
             projectCostHuijiListVO.setScgs( huiji.getScgs() );
             projectCostHuijiListVO.setWxys(wxysSum);
             projectCostHuijiListVO.setClys(clysSum);
+            projectCostHuijiListVO.setHjstatus(huiji.getHjstatus());
         }
         List<ProjectCostVO> list = children;
         if ( list != null ) {

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/vo/ProjectCostHuijiListVO.java

@@ -226,6 +226,19 @@ public class ProjectCostHuijiListVO implements Serializable {
     @ApiModelProperty(value = "外协预算")
     private java.math.BigDecimal wxys;
 
+    /** 汇集状态 */
+    @Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    private java.lang.String hjstatus;
+
+    public String getHjstatus() {
+        return hjstatus;
+    }
+
+    public void setHjstatus(String hjstatus) {
+        this.hjstatus = hjstatus;
+    }
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }