项目成本汇集总和

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

@@ -18,6 +18,7 @@ import org.jeecg.modules.projectCostHuiji.convert.ProjectCostHuijiConvert;
 import org.jeecg.modules.projectCostHuiji.entity.ProjectCostHuiji;
 import org.jeecg.modules.projectCostHuiji.service.IProjectCostHuijiService;
 import org.jeecg.modules.projectCostHuiji.vo.ProjectCostHuijiListVO;
+import org.jeecg.modules.projectCostHuiji.vo.ProjectCostHuijiSumVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -62,10 +63,13 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
 	//@AutoLog(value = "项目成本汇集表-分页列表查询")
 	@ApiOperation(value="项目成本汇集——分页查询——两级（一级汇集、二级主任务及主批产任务及子任务及子批产任务）", notes="项目成本汇集——分页查询——两级（一级汇集、二级主任务及子任务）")
 	@GetMapping(value = "/list")
-	public Result<IPage<ProjectCostHuijiListVO>> queryPageList(ProjectCostHuiji projectCostHuiji,
+	public Result<ProjectCostHuijiSumVO> queryPageList(ProjectCostHuiji projectCostHuiji,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
+		ProjectCostHuijiSumVO sumVO = new ProjectCostHuijiSumVO();
+		ProjectCostHuiji huiji = projectCostHuijiService.costHJSum(projectCostHuiji);//汇集总和
+
 		QueryWrapper<ProjectCostHuiji> queryWrapper = QueryGenerator.initQueryWrapper(projectCostHuiji, req.getParameterMap());
 		Page<ProjectCostHuiji> page = new Page<ProjectCostHuiji>(pageNo, pageSize);
 		Page<ProjectCostHuiji> pageList = projectCostHuijiService.page(page, queryWrapper);
@@ -80,8 +84,12 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
 				children.addAll(children2);
 				return ProjectCostHuijiConvert.INSTANCE.toHuijiListVO(i,children);
 			}).collect(Collectors.toList());
-			return Result.OK(ProjectCostHuijiConvert.INSTANCE.toHuijiListVOPage(pageList,list));
-		}else return Result.OK(new Page<ProjectCostHuijiListVO>());
+			IPage<ProjectCostHuijiListVO> pageList1 = ProjectCostHuijiConvert.INSTANCE.toHuijiListVOPage(pageList,list);
+
+			sumVO.setProjectCostHuijiSum(huiji);
+			sumVO.setPageList(pageList1);
+			return Result.OK(sumVO);
+		}else return Result.OK(new ProjectCostHuijiSumVO());
 	}
 	/**
 	 *   添加

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/mapper/ProjectCostHuijiMapper.java

@@ -14,4 +14,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ProjectCostHuijiMapper extends BaseMapper<ProjectCostHuiji> {
 
+    /**计算项目成本汇集的总和*/
+    public ProjectCostHuiji costHJSum(ProjectCostHuiji projectCostHuiji);
+
 }

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/mapper/xml/ProjectCostHuijiMapper.xml

@@ -2,4 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.projectCostHuiji.mapper.ProjectCostHuijiMapper">
 
-</mapper>
+    <!-- 计算项目成本汇集的总和 -->
+    <select id="costHJSum" resultType="org.jeecg.modules.projectCostHuiji.entity.ProjectCostHuiji">
+        select sum(lre) as lre,sum(lrl) as lrl,sum(EstimationCoat) as EstimationCoat,sum(contractfpe) as contractfpe,
+               sum(TaskMoney) as TaskMoney,sum(zcb) as zcb,sum(clf) as clf,sum(zyf) as zyf,sum(swf) as swf,
+               sum(wxf) as wxf,sum(rldlf) as rldlf,sum(gdzczj) as gdzczj,sum(gzjlwf) as gzjlwf,sum(glf) as glf,
+               sum(zjcb) as zjcb,sum(lbsy ) as lbsy,sum(workhour) as workhour,sum(zrbm) as zrbm,sum(sjgs) as sjgs,
+               sum(scgs) as scgs
+        from kzks_project_cost_huiji
+        <where>
+            <if test="taskno != null  and taskno != ''">and taskno = #{taskno}</if>
+            <if test="taskname != null  and taskname != ''">and taskname like concat('%', #{taskname}, '%')</if>
+        </where>
+    </select>
+
+</mapper>

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/service/IProjectCostHuijiService.java

@@ -11,4 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProjectCostHuijiService extends IService<ProjectCostHuiji> {
 
+    /**计算项目成本汇集的总和*/
+    public ProjectCostHuiji costHJSum(ProjectCostHuiji projectCostHuiji);
+
 }

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/service/impl/ProjectCostHuijiServiceImpl.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.projectCostHuiji.service.impl;
 import org.jeecg.modules.projectCostHuiji.entity.ProjectCostHuiji;
 import org.jeecg.modules.projectCostHuiji.mapper.ProjectCostHuijiMapper;
 import org.jeecg.modules.projectCostHuiji.service.IProjectCostHuijiService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,4 +17,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class ProjectCostHuijiServiceImpl extends ServiceImpl<ProjectCostHuijiMapper, ProjectCostHuiji> implements IProjectCostHuijiService {
 
+    @Autowired
+    @SuppressWarnings("all")
+    private ProjectCostHuijiMapper huijiMapper;
+
+    /**计算项目成本汇集的总和*/
+    public ProjectCostHuiji costHJSum(ProjectCostHuiji projectCostHuiji){
+        return huijiMapper.costHJSum(projectCostHuiji);
+    }
+
 }

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

@@ -0,0 +1,13 @@
+package org.jeecg.modules.projectCostHuiji.vo;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.Data;
+import org.jeecg.modules.projectCostHuiji.entity.ProjectCostHuiji;
+
+@Data
+public class ProjectCostHuijiSumVO {
+
+    private ProjectCostHuiji projectCostHuijiSum;
+    private IPage<ProjectCostHuijiListVO> pageList;
+
+}