fix 项目成本

module_kzks/src/main/java/org/jeecg/modules/projectCost/mapper/ProjectCostMapper.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.projectCost.entity.ProjectCost;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.projectCost.vo.ProjectCostVO;
 
 /**
  * @Description: 项目成本
@@ -21,10 +22,10 @@ public interface ProjectCostMapper extends BaseMapper<ProjectCost> {
     public void updateYS(BigDecimal clys,BigDecimal wxys, String taskno);
 
     /**根据任务号查询项目成本的主任务及组批后的主任务*/
-    public List<ProjectCost> costListByTaskNoMain(String taskno);
+    public List<ProjectCostVO> costListByTaskNoMain(String taskno);
 
     /**根据任务号查询项目成本的子任务及组批后的子任务*/
-    public List<ProjectCost> costListByTaskNoSub(String taskno);
+    public List<ProjectCostVO> costListByTaskNoSub(String taskno);
 
     /**
      * 对比

module_kzks/src/main/java/org/jeecg/modules/projectCost/mapper/xml/ProjectCostMapper.xml

@@ -3,26 +3,30 @@
 <mapper namespace="org.jeecg.modules.projectCost.mapper.ProjectCostMapper">
 
     <!--根据任务号查询项目成本的主任务及组批后的主任务 -->
-    <select id="costListByTaskNoMain" resultType="org.jeecg.modules.projectCost.entity.ProjectCost">
+    <select id="costListByTaskNoMain" resultType="org.jeecg.modules.projectCost.vo.ProjectCostVO">
         select c.id,c.taskno,c.taskname,c.xhname,c.jhwcsj,c.yzjdname,c.processPercent,c.cost_percent,c.yzsl,
                c.one_income,c.one_cost,c.one_profit,c.lre,c.lrl,c.EstimationCoat,c.contractfpe,c.TaskMoney,c.zcb,
                c.clf ,c.zyf,c.swf,c.wxf,c.rldlf,c.gdzczj,c.gzjlwf,c.glf,IFNULL(c.zjcb,m.value) AS zjcb,c.lbsy ,
                c.workhour,c.zrbm,c.jycsid,c.jycs ,c.hxzxid,c. hxzxname ,c.tasktype,c.AuditPrice,c.iflag,c.Brief,
-               c.reftaskno,c.pcCode,c.bcCode,c.blCode,c.BusinessMan,c.sjgs,c.scgs,c.status,c.proportion,c.clys,c.wxys
+               c.reftaskno,c.pcCode,c.bcCode,c.blCode,c.BusinessMan,c.sjgs,c.scgs,c.status,c.proportion,c.clys,c.wxys,
+               ys.clys, ys.wxys, 2 as ji
         from kzks_project_cost c
-        left join mes_info_installationcost m on m.taskno = #{taskno}
+        left join mes_info_installationcost m on  m.taskno = #{taskno}
+        left join kzks_project_cost_ys ys on ys.taskno = #{taskno}
         where c.taskno = #{taskno} order by status
     </select>
 
     <!--根据任务号查询项目成本的子任务及组批后的子任务 -->
-    <select id="costListByTaskNoSub" resultType="org.jeecg.modules.projectCost.entity.ProjectCost">
+    <select id="costListByTaskNoSub" resultType="org.jeecg.modules.projectCost.vo.ProjectCostVO">
         select c.id,c.taskno,c.taskname,c.xhname,c.jhwcsj,c.yzjdname,c.processPercent,c.cost_percent,c.yzsl,
                c.one_income,c.one_cost,c.one_profit,c.lre,c.lrl,c.EstimationCoat,c.contractfpe,c.TaskMoney,c.zcb,
                c.clf ,c.zyf,c.swf,c.wxf,c.rldlf,c.gdzczj,c.gzjlwf,c.glf,IFNULL(c.zjcb,m.value) AS zjcb,c.lbsy ,
                c.workhour,c.zrbm,c.jycsid,c.jycs ,c.hxzxid,c. hxzxname ,c.tasktype,c.AuditPrice,c.iflag,c.Brief,
-               c.reftaskno,c.pcCode,c.bcCode,c.blCode,c.BusinessMan,c.sjgs,c.scgs,c.status,c.proportion,c.clys,c.wxys
+               c.reftaskno,c.pcCode,c.bcCode,c.blCode,c.BusinessMan,c.sjgs,c.scgs,c.status,c.proportion,c.clys,c.wxys,
+               ys.clys, ys.wxys, 2 as ji
         from kzks_project_cost c
                  left join mes_info_installationcost m on m.taskno = #{taskno}
+                 left join kzks_project_cost_ys ys on ys.taskno = #{taskno}
         where c.reftaskno = #{taskno} order by taskno ,status
     </select>
 

module_kzks/src/main/java/org/jeecg/modules/projectCost/service/IProjectCostService.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.projectCost.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.projectCost.entity.ProjectCost;
 import org.jeecg.modules.projectCost.vo.ProjectCostListVO;
+import org.jeecg.modules.projectCost.vo.ProjectCostVO;
 
 import java.util.List;
 
@@ -18,10 +19,10 @@ public interface IProjectCostService extends IService<ProjectCost> {
     public ProjectCostListVO getPCRWList(String pccode);
 
     /**根据任务号查询项目成本的主任务及组批后的主任务*/
-    public List<ProjectCost> costListByTaskNoMain(String taskno);
+    public List<ProjectCostVO> costListByTaskNoMain(String taskno);
 
     /**根据任务号查询项目成本的子任务及组批后的子任务*/
-    public List<ProjectCost> costListByTaskNoSub(String taskno);
+    public List<ProjectCostVO> costListByTaskNoSub(String taskno);
 
     /**
      * 对比

module_kzks/src/main/java/org/jeecg/modules/projectCost/service/impl/ProjectCostServiceImpl.java

@@ -9,6 +9,7 @@ import org.jeecg.modules.projectCost.entity.ProjectCost;
 import org.jeecg.modules.projectCost.mapper.ProjectCostMapper;
 import org.jeecg.modules.projectCost.service.IProjectCostService;
 import org.jeecg.modules.projectCost.vo.ProjectCostListVO;
+import org.jeecg.modules.projectCost.vo.ProjectCostVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -46,14 +47,14 @@ public class ProjectCostServiceImpl extends ServiceImpl<ProjectCostMapper, Proje
      * */
     // 将注解标注在方法上，表示此方法使用数据源2
     @TargetDataSource(value = DataSourceType.SLAVE)
-    public List<ProjectCost> costListByTaskNoMain(String taskno){
+    public List<ProjectCostVO> costListByTaskNoMain(String taskno){
         return projectCostMapper.costListByTaskNoMain(taskno);
     }
 
     /**根据任务号查询项目成本的子任务及组批后的子任务*/
     // 将注解标注在方法上，表示此方法使用数据源2
     @TargetDataSource(value = DataSourceType.SLAVE)
-    public List<ProjectCost> costListByTaskNoSub(String taskno){
+    public List<ProjectCostVO> costListByTaskNoSub(String taskno){
         return projectCostMapper.costListByTaskNoSub(taskno);
     }
 

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

@@ -10,10 +10,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.mesInfoInstallationcost.entity.MesInfoInstallationcost;
 import org.jeecg.modules.mesInfoInstallationcost.service.IMesInfoInstallationcostService;
-import org.jeecg.modules.projectCost.convert.ProjectCostConvert;
-import org.jeecg.modules.projectCost.entity.ProjectCost;
 import org.jeecg.modules.projectCost.service.IProjectCostService;
 import org.jeecg.modules.projectCost.vo.ProjectCostVO;
 import org.jeecg.modules.projectCostHuiji.convert.ProjectCostHuijiConvert;
@@ -88,15 +85,12 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
 		if(pageList != null ){
 			List<ProjectCostHuijiListVO> list=pageList.getRecords().stream().map(i -> {
 
-				List<ProjectCost> children1 = costService.costListByTaskNoMain(i.getTaskno()); //主任务及批产的主任务
-				List<ProjectCost> children2 = costService.costListByTaskNoSub(i.getTaskno()); //子任务及批产的子任务
-
-				List<ProjectCostVO> costVOS1 = children1.stream().map(j->ProjectCostConvert.INSTANCE.toProjectCostVO(j,2)).collect(Collectors.toList());
-				List<ProjectCostVO> costVOS2 = children2.stream().map(j->ProjectCostConvert.INSTANCE.toProjectCostVO(j,2)).collect(Collectors.toList());
+				List<ProjectCostVO> children1 = costService.costListByTaskNoMain(i.getTaskno()); //主任务及批产的主任务
+				List<ProjectCostVO> children2 = costService.costListByTaskNoSub(i.getTaskno()); //子任务及批产的子任务
 
 				List<ProjectCostVO> children =new ArrayList<>();
-				children.addAll(costVOS1);
-				children.addAll(costVOS2);
+				children.addAll(children1);
+				children.addAll(children2);
 
 				return ProjectCostHuijiConvert.INSTANCE.toHuijiListVO(i,children,1);