Merge remote-tracking branch 'origin/master'

module_kzks/src/main/java/org/jeecg/modules/costModelClPrice/mapper/CostModelClPriceMapper.java

@@ -1,8 +1,13 @@
 package org.jeecg.modules.costModelClPrice.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.costModelClPrice.entity.CostModelClPrice;
 import org.jeecg.modules.costModelXmxqCl.entity.CostModelXmxqCl;
+import org.jeecg.modules.costModelXmxqWx.entity.CostModelXmxqWx;
+
+import java.util.List;
 
 /**
  * @Description: 材料价格库
@@ -15,4 +20,9 @@ public interface CostModelClPriceMapper extends BaseMapper<CostModelClPrice> {
     /**查询*/
     public CostModelXmxqCl selectClPriceValue(CostModelXmxqCl cl);
 
+    /**成本模型——材料费详情——根据物料编码、规格型号、质量等级、批次查询*/
+//    @Select("select danjia, HT_DATE from kzks_cost_model_cl_price where wlbm = #{wlbm} and ggxh=#{ggxh} and zl_level=#{zlLevel} and pici=#{pici}")
+//    public List<CostModelClPrice> getCLPDetailList(@Param("wlbm") String wlbm, @Param("ggxh") String ggxh, @Param("zlLevel") String zlLevel, @Param("pici") String pici);
+    public List<CostModelClPrice> getCLPDetailList(CostModelXmxqCl cl);
+
 }

module_kzks/src/main/java/org/jeecg/modules/costModelClPrice/mapper/xml/CostModelClPriceMapper.xml

@@ -41,4 +41,17 @@
             <if test="pici != null  and pici != ''">and pici = #{pici}</if>
         </where>
     </select>
+
+    <select id="getCLPDetailList" parameterType="org.jeecg.modules.costModelXmxqCl.entity.CostModelXmxqCl" resultType="org.jeecg.modules.costModelClPrice.entity.CostModelClPrice">
+    select wlbm, ggxh, zl_level, pici, danjia, HT_DATE FROM kzks_cost_model_cl_price
+        <where>
+            <if test="wlbm != null  and wlbm != ''">and wlbm = #{wlbm}</if>
+            <if test="ggxh != null  and ggxh != ''">and ggxh = #{ggxh}</if>
+<!--            <if test="ggxh is null">and ggxh IS NULL</if>-->
+<!--            <if test="ggxh == ''">and ggxh = ''</if>-->
+            <if test="zlLevel != null  and zlLevel != ''">and zl_level = #{zlLevel}</if>
+            <if test="pici != null  and pici != ''">and pici = #{pici}</if>
+        </where>
+    </select>
+
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/costModelClPrice/service/ICostModelClPriceService.java

@@ -1,9 +1,13 @@
 package org.jeecg.modules.costModelClPrice.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.costModelClPrice.entity.CostModelClPrice;
 import org.jeecg.modules.costModelXmxqCl.entity.CostModelXmxqCl;
 
+import java.util.List;
+
 /**
  * @Description: 材料价格库
  * @Author: jeecg-boot
@@ -15,4 +19,10 @@ public interface ICostModelClPriceService extends IService<CostModelClPrice> {
     /**查询*/
     public CostModelXmxqCl selectClPriceValue(CostModelXmxqCl cl);
 
+    /**成本模型——材料费详情——根据物料编码、规格型号、质量等级、批次查询*/
+//   public List<CostModelClPrice> getCLPDetailList(String wlbm, String ggxh, String zlLevel, String pici);
+   public List<CostModelClPrice> getCLPDetailList(CostModelXmxqCl cl);
+
+
+
 }

module_kzks/src/main/java/org/jeecg/modules/costModelClPrice/service/impl/CostModelClPriceServiceImpl.java

@@ -10,6 +10,8 @@ import org.jeecg.modules.dataSourceSwitch.enums.DataSourceType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @Description: 材料价格库
  * @Author: jeecg-boot
@@ -29,4 +31,12 @@ public class CostModelClPriceServiceImpl extends ServiceImpl<CostModelClPriceMap
         return clPriceMapper.selectClPriceValue(cl);
     }
 
+    /**成本模型——材料费详情——根据物料编码、规格型号、质量等级、批次查询*/
+//    public List<CostModelClPrice> getCLPDetailList(String wlbm, String ggxh, String zlLevel, String pici){
+//        return clPriceMapper.getCLPDetailList(wlbm, ggxh, zlLevel, pici);
+//    }
+    public List<CostModelClPrice> getCLPDetailList(CostModelXmxqCl cl){
+        return clPriceMapper.getCLPDetailList(cl);
+    }
+
 }

module_kzks/src/main/java/org/jeecg/modules/costModelClPrice/vo/CostModelClPriceExportVO.java

@@ -0,0 +1,86 @@
+package org.jeecg.modules.costModelClPrice.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * ClassName: CostModelClPriceExportVO
+ * Package: org.jeecg.modules.costModelClPrice.vo
+ * Description:
+ *
+ * 材料价格库查找结果详情导出excel所需属性
+ *
+ * @Author sl
+ * @Create 2023/9/18 16:39
+ * @Version 1.0
+ */
+@Data
+public class CostModelClPriceExportVO {
+    private static final long serialVersionUID = 1L;
+
+    /**id*/
+//    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private java.lang.String id;
+    /**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+    /**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+    /**更新日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+    /**项目ID*/
+//	@Excel(name = "项目ID", width = 15)
+    @ApiModelProperty(value = "项目ID")
+    private java.lang.String xiangmuId;
+    /**项目名称*/
+    @Excel(name = "项目名称", width = 15)
+    @ApiModelProperty(value = "项目名称")
+    private java.lang.String xiangmuName;
+    /**物料编码*/
+    @Excel(name = "物料编码", width = 15)
+    @ApiModelProperty(value = "物料编码")
+    private java.lang.String wlbm;
+    /**规格型号*/
+    @Excel(name = "规格型号", width = 15)
+    @ApiModelProperty(value = "规格型号")
+    private java.lang.String ggxh;
+    /**质量等级*/
+    @Excel(name = "质量等级", width = 15)
+    @ApiModelProperty(value = "质量等级")
+    private java.lang.String zlLevel;
+    /**批次*/
+    @Excel(name = "批次", width = 15)
+    @ApiModelProperty(value = "批次")
+    private java.lang.String pici;
+    /**合同签署日期*/
+    @Excel(name = "合同签署日期", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "合同签署日期")
+    private java.util.Date htDate;
+    /**数量*/
+//    @Excel(name = "数量", width = 15)
+    @ApiModelProperty(value = "数量")
+    private java.lang.String number;
+    /**单价*/
+    @Excel(name = "单价", width = 15)
+    @ApiModelProperty(value = "单价")
+    private java.lang.String danjia;
+
+}

module_kzks/src/main/java/org/jeecg/modules/costModelList/service/ICostModelListService.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.costModelList.service;
 
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.costModelClPrice.entity.CostModelClPrice;
 import org.jeecg.modules.costModelList.entity.CostModelList;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.costModelWxPrice.mapper.CostModelWxPriceMapper;
@@ -33,9 +34,4 @@ public interface ICostModelListService extends IService<CostModelList> {
     /**成本模型——外协费材料费各自最大值最小值平均值近期值总和——根据项目id查询*/
     public List<CostModelList> getWXFCLFDetailList(String xiangmuid);
 
-    /**项目成本——事务费详情——根据项目id查询*/
-    public List<CostModelXmxqWx> getWXFDetailList(String xiangmuid);
-
-    /**成本模型——材料费详情——根据项目id查询*/
-    public List<CostModelXmxqCl> getCLFDetailList(String xiangmuid);
 }

module_kzks/src/main/java/org/jeecg/modules/costModelList/service/impl/CostModelListServiceImpl.java

@@ -4,13 +4,20 @@ import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.costModelClPrice.entity.CostModelClPrice;
+import org.jeecg.modules.costModelClPrice.mapper.CostModelClPriceMapper;
+import org.jeecg.modules.costModelClPrice.service.ICostModelClPriceService;
+import org.jeecg.modules.costModelClPrice.service.impl.CostModelClPriceServiceImpl;
+import org.jeecg.modules.costModelClPrice.vo.CostModelClPriceExportVO;
 import org.jeecg.modules.costModelList.entity.CostModelList;
 import org.jeecg.modules.costModelList.mapper.CostModelListMapper;
 import org.jeecg.modules.costModelList.service.ICostModelListService;
 import org.jeecg.modules.costModelXmxqCl.entity.CostModelXmxqCl;
 import org.jeecg.modules.costModelXmxqCl.mapper.CostModelXmxqClMapper;
+import org.jeecg.modules.costModelXmxqCl.service.ICostModelXmxqClService;
 import org.jeecg.modules.costModelXmxqWx.entity.CostModelXmxqWx;
 import org.jeecg.modules.costModelXmxqWx.mapper.CostModelXmxqWxMapper;
+import org.jeecg.modules.costModelXmxqWx.service.ICostModelXmxqWxService;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
@@ -37,13 +44,19 @@ import java.util.Map;
 public class CostModelListServiceImpl extends ServiceImpl<CostModelListMapper, CostModelList> implements ICostModelListService {
     @Autowired
     @SuppressWarnings("all")
-    public CostModelListMapper costModelListMapper;
+    private CostModelListMapper costModelListMapper;
+
     @Autowired
     @SuppressWarnings("all")
-    public CostModelXmxqWxMapper wxfMapper;
+    private ICostModelClPriceService costModelClPriceService;
+
+    @Autowired
+    @SuppressWarnings("all")
+    private ICostModelXmxqWxService costModelXmxqWxService;
+
     @Autowired
     @SuppressWarnings("all")
-    public CostModelXmxqClMapper clfMapper;
+    private ICostModelXmxqClService costModelXmxqClService;
 
     /**判端项目名称是否重名,false无重名，true重名*/
     public Boolean chongmingPanduan(String xmName){
@@ -58,11 +71,34 @@ public class CostModelListServiceImpl extends ServiceImpl<CostModelListMapper, C
     public ModelAndView exportXlsWXFCLFDetail(String xiangmuid, Class<CostModelList> clazz, String title) {
 //        System.out.println("进入服务层");
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        //1.根据项目id查出外协费材料费总计价格、外协费详情、材料费详情
+        //1.根据项目id查出外协费材料费总计价格、外协费总和详情、材料费总和详情
 //        System.out.println("从数据库中获取详情列表");
         List<CostModelList> listWxfClf = getWXFCLFDetailList(xiangmuid);
-        List<CostModelXmxqWx> listWxf = getWXFDetailList(xiangmuid);
-        List<CostModelXmxqCl> listClf = getCLFDetailList(xiangmuid);
+        List<CostModelXmxqWx> listWxf = costModelXmxqWxService.getWXFDetailList(xiangmuid);
+        List<CostModelXmxqCl> listClf = costModelXmxqClService.getCLFDetailList(xiangmuid);
+
+        //用来存储查找到的材料价格库详情信息
+        List<CostModelClPriceExportVO> listClPToExcel = new ArrayList<>();
+        for(CostModelXmxqCl xmxqCl:listClf){
+            //根据物料编码、规格型号、质量等级、批次查找单价以及采购时间
+            List<CostModelClPrice> listClp = costModelClPriceService.getCLPDetailList(xmxqCl);
+
+            for(CostModelClPrice clp:listClp){
+                CostModelClPriceExportVO clPriceExportVO = new CostModelClPriceExportVO();
+                clPriceExportVO.setXiangmuName(xmxqCl.getXiangmuName());
+                clPriceExportVO.setWlbm(clp.getWlbm());
+                clPriceExportVO.setGgxh(clp.getGgxh());
+                clPriceExportVO.setZlLevel(clp.getZlLevel());
+                clPriceExportVO.setPici(clp.getPici());
+                clPriceExportVO.setHtDate(clp.getHtDate());
+                clPriceExportVO.setDanjia(clp.getDanjia());
+                clPriceExportVO.setNumber(xmxqCl.getNumber());
+                listClPToExcel.add(clPriceExportVO);
+            }
+        }
+//        System.out.println("获取写入表格的材料费详情信息");
+//        listClPToExcel.forEach(System.out::println);
+
 //        CostModelList wxfclfAll = new CostModelList();   //创建成本模型对象存储项目的外协费材料费总和  此处只是项目唯一选中进行导出
 //        for(CostModelList wxfclf:listWxfClf){
 //            wxfclfAll.setMaxWxf(wxfclf.getMaxWxf());
@@ -73,13 +109,13 @@ public class CostModelListServiceImpl extends ServiceImpl<CostModelListMapper, C
 //            wxfclfAll.setAveClf(wxfclf.getAveClf());
 //            wxfclfAll.setRecentClf(wxfclf.getRecentClf());
 //        }
+
         CostModelXmxqWx wxfAll = new CostModelXmxqWx();
         wxfAll.setXiangmuName("合计");
         wxfAll.setMaxPrice(listWxfClf.get(0).getMaxWxf());
         wxfAll.setMinPrice(listWxfClf.get(0).getMinWxf());
         wxfAll.setAvePrice(listWxfClf.get(0).getAveWxf());
         listWxf.add(wxfAll);
-
         CostModelXmxqCl clfAll = new CostModelXmxqCl();
         clfAll.setXiangmuName("合计");
         clfAll.setMaxPrice(listWxfClf.get(0).getMaxClf());
@@ -87,25 +123,36 @@ public class CostModelListServiceImpl extends ServiceImpl<CostModelListMapper, C
         clfAll.setAvePrice(listWxfClf.get(0).getAveClf());
         clfAll.setRecentPrice(listWxfClf.get(0).getRecentClf());
         listClf.add(clfAll);
+//        System.out.println("获取外协费和材料费总和信息");
+//        listWxf.forEach(System.out::println);
+//        listClf.forEach(System.out::println);
+
+
         //2.多sheep输入
         List<Map<String, Object>> list = new ArrayList<>();
         //外协费
 //        System.out.println("制作外协表");
         Map<String, Object> map1 = new HashMap<>();
         map1.put(NormalExcelConstants.CLASS, CostModelXmxqWx.class);
-        map1.put(NormalExcelConstants.PARAMS, new ExportParams("外协费详情表", "导出人:" + sysUser.getRealname(), "外协费"));
+        map1.put(NormalExcelConstants.PARAMS, new ExportParams("外协费总和详情表", "导出人:" + sysUser.getRealname(), "外协费"));
         map1.put(NormalExcelConstants.DATA_LIST, listWxf);
-
-
         list.add(map1);
         //材料费
 //        System.out.println("制作材料表");
         Map<String, Object> map2 = new HashMap<>();
         map2.put(NormalExcelConstants.CLASS, CostModelXmxqCl.class);
-        map2.put(NormalExcelConstants.PARAMS, new ExportParams("材料费详情表", "导出人:" + sysUser.getRealname(), "材料费"));
+        map2.put(NormalExcelConstants.PARAMS, new ExportParams("材料费总和详情表", "导出人:" + sysUser.getRealname(), "材料费"));
         map2.put(NormalExcelConstants.DATA_LIST, listClf);
         list.add(map2);
 
+        //材料费详情
+//        System.out.println("制作材料详情表");
+        Map<String, Object> map3 = new HashMap<>();
+        map3.put(NormalExcelConstants.CLASS, CostModelClPriceExportVO.class);
+        map3.put(NormalExcelConstants.PARAMS, new ExportParams("材料价格详情表", "导出人:" + sysUser.getRealname(), "材料价格详情"));
+        map3.put(NormalExcelConstants.DATA_LIST, listClPToExcel);
+        list.add(map3);
+
         //3.AutoPoi 导出Excel
 //        System.out.println("导出excel");
         ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
@@ -123,17 +170,5 @@ public class CostModelListServiceImpl extends ServiceImpl<CostModelListMapper, C
         return costModelListMapper.getWXFCLFDetailList(xiangmuid);
     }
 
-    /**成本模型——外协费详情——根据项目id查询*/
-    public List<CostModelXmxqWx> getWXFDetailList(String xiangmuid){
-//        System.out.println("获取外协费详情");
-//        System.out.println(wxfMapper.getWXFDetailList(xiangmuid));
-        return wxfMapper.getWXFDetailList(xiangmuid);
-    }
 
-    /**成本模型——材料费详情——根据项目id查询*/
-    public List<CostModelXmxqCl> getCLFDetailList(String xiangmuid){
-//        System.out.println("获取材料费详情");
-//        System.out.println(clfMapper.getCLFDetailList(xiangmuid));
-        return clfMapper.getCLFDetailList(xiangmuid);
-    }
 }

module_kzks/src/main/java/org/jeecg/modules/costModelWxPrice/entity/CostModelWxPrice.java

@@ -72,7 +72,7 @@ public class CostModelWxPrice implements Serializable {
     @ApiModelProperty(value = "计量单位")
     private java.lang.String unit;
 	/**备注*/
-	@Excel(name = "备注", width = 15)
+	@Excel(name = "项目描述", width = 15)
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
     /**单价（最大值）*/

module_kzks/src/main/java/org/jeecg/modules/costModelWxPrice/mapper/CostModelWxPriceMapper.java

@@ -24,6 +24,6 @@ public interface CostModelWxPriceMapper extends BaseMapper<CostModelWxPrice> {
     public List<CostModelWxPrice> getWXPAllDetailList();
 
     /**外协价格库-通过外协项目查看表中的数据-用来判断导入的数据是否有重复数据*/
-    @Select("select wx_company, unit, max_price, min_price, ave_price from kzks_cost_model_wx_price where wx_project = #{wx_project}")
+    @Select("select wx_company, unit, max_price, min_price, ave_price, remark from kzks_cost_model_wx_price where wx_project = #{wx_project}")
     public List<CostModelWxPrice> getWXPFProDetailList(@Param("wx_project") String wx_project);
 }

module_kzks/src/main/java/org/jeecg/modules/costModelXmxqCl/entity/CostModelXmxqCl.java

@@ -76,11 +76,17 @@ public class CostModelXmxqCl implements Serializable {
     @ApiModelProperty(value = "批次")
     private java.lang.String pici;
 	/**采购日期*/
-	@Excel(name = "采购日期", width = 15, format = "yyyy-MM-dd")
+//	@Excel(name = "采购日期", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "采购日期")
     private java.util.Date caigouTime;
+    /**合同签署日期*/
+    @Excel(name = "合同签署日期", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "合同签署日期")
+    private java.util.Date htDate;
 	/**数量*/
 	@Excel(name = "数量", width = 15)
     @ApiModelProperty(value = "数量")
@@ -107,7 +113,7 @@ public class CostModelXmxqCl implements Serializable {
     private java.lang.String recentDanjia;
     /**价格（单价最大值*数量）*/
 //    @Excel(name = "价格（单价最大值*数量）", width = 15)
-    @Excel(name = "最大值", width = 15, groupName = "金额")
+//    @Excel(name = "最大值", width = 15, groupName = "金额")
     @ApiModelProperty(value = "价格（单价最大值*数量）")
     private java.lang.String maxPrice;
     /**价格（单价最小值*数量）*/
@@ -125,4 +131,11 @@ public class CostModelXmxqCl implements Serializable {
     @Excel(name = "近期值", width = 15, groupName = "金额")
     @ApiModelProperty(value = "价格（单价近期值*数量）")
     private java.lang.String recentPrice;
+
+    /**单价（为了输出表格而设）弃*/
+//    @Excel(name = "单价", width = 15)
+    @ApiModelProperty(value = "单价")
+    private java.lang.String danjia;
+
+
 }

module_kzks/src/main/java/org/jeecg/modules/costModelXmxqCl/mapper/CostModelXmxqClMapper.java

@@ -16,6 +16,6 @@ import org.jeecg.modules.projectChbSwf.entity.ProjectChbSwf;
  */
 public interface CostModelXmxqClMapper extends BaseMapper<CostModelXmxqCl> {
     /**成本模型——材料费详情——根据项目id查询*/
-    @Select("select xiangmu_name, wlbm, ggxh, zl_level, pici, caigou_time, number, max_danjia, min_danjia, ave_danjia, recent_danjia, max_price, min_price, ave_price, recent_price from kzks_cost_model_xmxq_cl where xiangmu_id = #{xiangmuid}")
+    @Select("select xiangmu_name, wlbm, ggxh, zl_level, pici, HT_DATE, number, max_danjia, min_danjia, ave_danjia, recent_danjia, max_price, min_price, ave_price, recent_price from kzks_cost_model_xmxq_cl where xiangmu_id = #{xiangmuid}")
     public List<CostModelXmxqCl> getCLFDetailList(@Param("xiangmuid") String xiangmuid);
 }

module_kzks/src/main/java/org/jeecg/modules/costModelXmxqCl/service/ICostModelXmxqClService.java

@@ -1,10 +1,14 @@
 package org.jeecg.modules.costModelXmxqCl.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.costModelList.entity.CostModelList;
 import org.jeecg.modules.costModelXmxqCl.entity.CostModelXmxqCl;
 
+import java.util.List;
+
 /**
  * @Description: 项目材料导入详情
  * @Author: jeecg-boot
@@ -18,4 +22,6 @@ public interface ICostModelXmxqClService extends IService<CostModelXmxqCl> {
      */
     public Result<CostModelList> importExcel1(String xmId, String xmName, String strUrl, Class<CostModelXmxqCl> clazz);
 
+    /**成本模型——材料费详情——根据项目id查询*/
+    public List<CostModelXmxqCl> getCLFDetailList(String xiangmuid);
 }

module_kzks/src/main/java/org/jeecg/modules/costModelXmxqCl/service/impl/CostModelXmxqClServiceImpl.java

@@ -5,6 +5,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.costModelClPrice.service.ICostModelClPriceService;
 import org.jeecg.modules.costModelList.entity.CostModelList;
+import org.jeecg.modules.costModelList.mapper.CostModelListMapper;
 import org.jeecg.modules.costModelXmxqCl.entity.CostModelXmxqCl;
 import org.jeecg.modules.costModelXmxqCl.mapper.CostModelXmxqClMapper;
 import org.jeecg.modules.costModelXmxqCl.service.ICostModelXmxqClService;
@@ -32,6 +33,10 @@ import java.util.List;
 public class CostModelXmxqClServiceImpl extends ServiceImpl<CostModelXmxqClMapper, CostModelXmxqCl> implements ICostModelXmxqClService {
     @Autowired
     @SuppressWarnings("all")
+    private CostModelXmxqClMapper costModelXmxqClMapper;
+
+    @Autowired
+    @SuppressWarnings("all")
     private ICostModelClPriceService costModelClPriceService;
 
     /**
@@ -104,4 +109,10 @@ public class CostModelXmxqClServiceImpl extends ServiceImpl<CostModelXmxqClMappe
         }
     }
 
+    /**成本模型——材料费详情——根据项目id查询*/
+    public List<CostModelXmxqCl> getCLFDetailList(String xiangmuid){
+//        System.out.println("获取材料费详情");
+//        System.out.println(clfMapper.getCLFDetailList(xiangmuid));
+        return costModelXmxqClMapper.getCLFDetailList(xiangmuid);
+    }
 }

module_kzks/src/main/java/org/jeecg/modules/costModelXmxqWx/entity/CostModelXmxqWx.java

@@ -76,7 +76,7 @@ public class CostModelXmxqWx implements Serializable {
     @ApiModelProperty(value = "数量")
     private java.lang.String number;
 	/**描述*/
-	@Excel(name = "描述", width = 15)
+	@Excel(name = "项目描述", width = 15)
     @ApiModelProperty(value = "描述")
     private java.lang.String remark;
     /**单价（最大值）*/

module_kzks/src/main/java/org/jeecg/modules/costModelXmxqWx/service/ICostModelXmxqWxService.java

@@ -1,11 +1,15 @@
 package org.jeecg.modules.costModelXmxqWx.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.costModelList.entity.CostModelList;
 import org.jeecg.modules.costModelList.vo.CostModelImportVO;
 import org.jeecg.modules.costModelXmxqWx.entity.CostModelXmxqWx;
 
+import java.util.List;
+
 /**
  * @Description: 项目外协导入详情
  * @Author: jeecg-boot
@@ -19,4 +23,7 @@ public interface ICostModelXmxqWxService extends IService<CostModelXmxqWx> {
      */
     public Result<CostModelImportVO> importExcel1(String xmId, String xmName, String strUrl, Class<CostModelXmxqWx> clazz);
 
+    /**成本模型——外协费详情——根据项目id查询*/
+    public List<CostModelXmxqWx> getWXFDetailList(String xiangmuid);
+
 }

module_kzks/src/main/java/org/jeecg/modules/costModelXmxqWx/service/impl/CostModelXmxqWxServiceImpl.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.costModelXmxqWx.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.costModelClPrice.mapper.CostModelClPriceMapper;
 import org.jeecg.modules.costModelList.entity.CostModelList;
 import org.jeecg.modules.costModelList.vo.CostModelImportVO;
 import org.jeecg.modules.costModelMsg.entity.CostModelMsg;
@@ -37,6 +38,10 @@ public class CostModelXmxqWxServiceImpl extends ServiceImpl<CostModelXmxqWxMappe
 
     @Autowired
     @SuppressWarnings("all")
+    private CostModelXmxqWxMapper costModelXmxqWxMapper;
+
+    @Autowired
+    @SuppressWarnings("all")
     private ICostModelWxPriceService costModelwXPriceService;
     @Autowired
     @SuppressWarnings("all")
@@ -139,4 +144,9 @@ public class CostModelXmxqWxServiceImpl extends ServiceImpl<CostModelXmxqWxMappe
         }
     }
 
+
+    /**成本模型——外协费详情——根据项目id查询*/
+    public List<CostModelXmxqWx> getWXFDetailList(String xiangmuid){
+        return costModelXmxqWxMapper.getWXFDetailList(xiangmuid);
+    }
 }