成本模型新增修改,导入任务关系映射、外协价格库

module_kzks/src/main/java/org/jeecg/modules/costModelClPrice/controller/CostModelClPriceController.java

@@ -1,55 +1,39 @@
 package org.jeecg.modules.costModelClPrice.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.costModelClPrice.entity.CostModelClPrice;
-import org.jeecg.modules.costModelClPrice.service.ICostModelClPriceService;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+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.costModelClPrice.entity.CostModelClPrice;
+import org.jeecg.modules.costModelClPrice.service.ICostModelClPriceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
 
- /**
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
  * @Description: 材料价格库
  * @Author: jeecg-boot
  * @Date:   2023-09-11
  * @Version: V1.0
  */
-@Api(tags="材料价格库")
+@Api(tags="...材料价格库")
 @RestController
 @RequestMapping("/costModelClPrice/costModelClPrice")
 @Slf4j
 public class CostModelClPriceController extends JeecgController<CostModelClPrice, ICostModelClPriceService> {
 	@Autowired
 	private ICostModelClPriceService costModelClPriceService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -71,7 +55,7 @@ public class CostModelClPriceController extends JeecgController<CostModelClPrice
 		IPage<CostModelClPrice> pageList = costModelClPriceService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -86,7 +70,7 @@ public class CostModelClPriceController extends JeecgController<CostModelClPrice
 		costModelClPriceService.save(costModelClPrice);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -101,7 +85,7 @@ public class CostModelClPriceController extends JeecgController<CostModelClPrice
 		costModelClPriceService.updateById(costModelClPrice);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -116,7 +100,7 @@ public class CostModelClPriceController extends JeecgController<CostModelClPrice
 		costModelClPriceService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -131,7 +115,7 @@ public class CostModelClPriceController extends JeecgController<CostModelClPrice
 		this.costModelClPriceService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

module_kzks/src/main/java/org/jeecg/modules/costModelList/controller/CostModelListController.java

@@ -14,6 +14,7 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.config.JeecgBaseConfig;
 import org.jeecg.modules.costModelList.convert.CostModelListConvert;
 import org.jeecg.modules.costModelList.dto.CostModelListAddDTO;
+import org.jeecg.modules.costModelList.dto.CostModelListUpdateDTO;
 import org.jeecg.modules.costModelList.entity.CostModelList;
 import org.jeecg.modules.costModelList.service.ICostModelListService;
 import org.jeecg.modules.costModelXmxqCl.entity.CostModelXmxqCl;
@@ -27,6 +28,9 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * @Description: 成本模型
@@ -60,12 +64,16 @@ public class CostModelListController extends JeecgController<CostModelList, ICos
 		 CostModelList costModelList = CostModelListConvert.INSTANCE.toCostModelList(dto);
 		 costModelListService.save(costModelList);
 
-		 String xmId = costModelList.getId();
+		 String xmId = dto.getId();
 	 	 String xmName = dto.getXmName();
-		 String clfUrl = jeecgBaseConfig.getPath().getUpload() + "/"+  dto.getClfurl().get(0).getFilePath();
-		 String wxfUrl = jeecgBaseConfig.getPath().getUpload() + "/"+  dto.getClfurl().get(0).getFilePath();
-		 log.info("导入的材料费详情地址为：",wxfUrl);
-		 log.info("导入的外协费详情地址为：",wxfUrl);
+		 String clfUrl1 = dto.getClfurl().get(0).getFilePath();
+		 String wxfUrl1 = dto.getWxfurl().get(0).getFilePath();
+		 costModelList.setClfUrl(clfUrl1);
+		 costModelList.setWxfUrl(wxfUrl1);
+		 String clfUrl = jeecgBaseConfig.getPath().getUpload() + "/"+  clfUrl1;
+		 String wxfUrl = jeecgBaseConfig.getPath().getUpload() + "/"+  wxfUrl1;
+		 log.info("导入的材料费详情地址为：{}",clfUrl);
+		 log.info("导入的外协费详情地址为：{}",wxfUrl);
 	 	 //计算并导入数据
 		 Result<CostModelList> result1 = clService.importExcel1(xmId, xmName, clfUrl, CostModelXmxqCl.class);
 		 CostModelList costModel1 = result1.getResult();
@@ -75,7 +83,7 @@ public class CostModelListController extends JeecgController<CostModelList, ICos
 			 costModelList.setAveClf(costModel1.getAveClf());
 			 costModelList.setRecentClf(costModel1.getRecentClf());
 		 }
-		 Result<CostModelList> result2 = wxService.importExcel1(xmId, xmName, clfUrl, CostModelXmxqWx.class);
+		 Result<CostModelList> result2 = wxService.importExcel1(xmId, xmName, wxfUrl, CostModelXmxqWx.class);
 		 CostModelList costModel2 = result2.getResult();
 		 if(costModel2!=null){
 			 costModelList.setMaxWxf(costModel2.getMaxWxf());
@@ -89,6 +97,51 @@ public class CostModelListController extends JeecgController<CostModelList, ICos
 	 }
 
 	/**
+	 *  编辑
+	 */
+	@AutoLog(value = "成本模型-编辑")
+	@ApiOperation(value="成本模型-编辑", notes="成本模型-编辑")
+	//@RequiresPermissions("org.jeecg.modules:kzks_cost_model:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CostModelListUpdateDTO dto) {
+		String xmId = dto.getId();
+		String xmName = dto.getXmName();
+		CostModelList costModelList = CostModelListConvert.INSTANCE.toCostModelList2(dto);
+		CostModelList costModelList1 = costModelListService.getById(dto.getId());
+
+		String clfUrl1 = dto.getClfurl().get(0).getFilePath();
+		String wxfUrl1 = dto.getWxfurl().get(0).getFilePath();
+		costModelList.setClfUrl(clfUrl1);
+		costModelList.setWxfUrl(wxfUrl1);
+		String clfUrl = jeecgBaseConfig.getPath().getUpload() + "/"+  clfUrl1;
+		String wxfUrl = jeecgBaseConfig.getPath().getUpload() + "/"+  wxfUrl1;
+
+		if(!Objects.equals(dto.getClfurl(),costModelList1.getClfUrl())){
+			Map<String, Object> columnMap = new HashMap<>();
+			columnMap.put("xiangmu_id",xmId);
+			clService.removeByMap(columnMap);
+
+			//计算并导入数据
+			Result<CostModelList> result1 = clService.importExcel1(xmId, xmName, clfUrl, CostModelXmxqCl.class);
+		}
+
+		if(!Objects.equals(dto.getWxfurl(),costModelList1.getWxfUrl())){
+			Map<String, Object> columnMap = new HashMap<>();
+			columnMap.put("xiangmu_id",xmId);
+			wxService.removeByMap(columnMap);
+
+			//计算并导入数据
+			Result<CostModelList> result1 = clService.importExcel1(xmId, xmName, clfUrl, CostModelXmxqCl.class);
+		}
+
+		costModelList.setXmName(xmName);
+		costModelList.setClfUrl(clfUrl1);
+		costModelList.setWxfUrl(wxfUrl1);
+		costModelListService.updateById(costModelList);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
 	 * 分页列表查询
 	 *
 	 * @param costModelList
@@ -126,20 +179,20 @@ public class CostModelListController extends JeecgController<CostModelList, ICos
 //		return Result.OK("添加成功！");
 //	}
 
-	/**
-	 *  编辑
-	 *
-	 * @param costModelList
-	 * @return
-	 */
-	@AutoLog(value = "成本模型-编辑")
-	@ApiOperation(value="成本模型-编辑", notes="成本模型-编辑")
-	//@RequiresPermissions("org.jeecg.modules:kzks_cost_model:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody CostModelList costModelList) {
-		costModelListService.updateById(costModelList);
-		return Result.OK("编辑成功!");
-	}
+//	/**
+//	 *  编辑
+//	 *
+//	 * @param costModelList
+//	 * @return
+//	 */
+//	@AutoLog(value = "成本模型-编辑")
+//	@ApiOperation(value="成本模型-编辑", notes="成本模型-编辑")
+//	//@RequiresPermissions("org.jeecg.modules:kzks_cost_model:edit")
+//	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+//	public Result<String> edit(@RequestBody CostModelList costModelList) {
+//		costModelListService.updateById(costModelList);
+//		return Result.OK("编辑成功!");
+//	}
 
 	 /**
 	  *  知会

module_kzks/src/main/java/org/jeecg/modules/costModelList/convert/CostModelListConvert.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.costModelList.convert;
 
 import org.jeecg.modules.costModelList.dto.CostModelListAddDTO;
+import org.jeecg.modules.costModelList.dto.CostModelListUpdateDTO;
 import org.jeecg.modules.costModelList.entity.CostModelList;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
@@ -19,4 +20,6 @@ public interface CostModelListConvert {
 //    @Mapping(target = "wxf",source = "wxf")
     CostModelList toCostModelList(CostModelListAddDTO dto);
 
+    CostModelList toCostModelList2(CostModelListUpdateDTO dto);
+
 }

module_kzks/src/main/java/org/jeecg/modules/costModelList/dto/CostModelListUpdateDTO.java

@@ -0,0 +1,56 @@
+package org.jeecg.modules.costModelList.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+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;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class CostModelListUpdateDTO  implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+    /**项目名称*/
+    @Excel(name = "项目名称", width = 15)
+    @ApiModelProperty(value = "项目名称")
+    private java.lang.String xmName;
+    /**外协费*/
+    @Excel(name = "外协费", width = 15)
+    @ApiModelProperty(value = "外协费文件地址")
+    private List<FileDTO> wxfurl;
+    /**材料费*/
+    @Excel(name = "材料费", width = 15)
+    @ApiModelProperty(value = "材料费文件地址")
+    private List<FileDTO> clfurl;
+    /**知会给*/
+    @ApiModelProperty(value = "知会给")
+    private java.lang.String informTo;
+    /**创建人*/
+    @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;
+}

module_kzks/src/main/java/org/jeecg/modules/costModelList/entity/CostModelList.java

@@ -91,4 +91,11 @@ public class CostModelList implements Serializable {
     @ApiModelProperty(value = "材料费（近期值）")
     private java.lang.String recentClf;
 
+    /**材料费文件地址*/
+    @ApiModelProperty(value = "材料费文件地址")
+    private java.lang.String clfUrl;
+    /**外协费文件地址*/
+    @ApiModelProperty(value = "外协费文件地址")
+    private java.lang.String wxfUrl;
+
 }

module_kzks/src/main/java/org/jeecg/modules/costModelWxPrice/controller/CostModelWxPriceController.java

@@ -1,44 +1,28 @@
 package org.jeecg.modules.costModelWxPrice.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.costModelWxPrice.entity.CostModelWxPrice;
-import org.jeecg.modules.costModelWxPrice.service.ICostModelWxPriceService;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-
-import org.jeecg.modules.projectChbSwf.entity.ProjectChbSwf;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+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.costModelWxPrice.entity.CostModelWxPrice;
+import org.jeecg.modules.costModelWxPrice.service.ICostModelWxPriceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
 
- /**
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+/**
  * @Description: 外协价格库
  * @Author: jeecg-boot
  * @Date:   2023-09-11
@@ -51,7 +35,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class CostModelWxPriceController extends JeecgController<CostModelWxPrice, ICostModelWxPriceService> {
 	@Autowired
 	private ICostModelWxPriceService costModelWxPriceService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -73,7 +57,7 @@ public class CostModelWxPriceController extends JeecgController<CostModelWxPrice
 		IPage<CostModelWxPrice> pageList = costModelWxPriceService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *  添加重复的数据报错不予录入   思路和导入excel相同  --sl
@@ -130,7 +114,7 @@ public class CostModelWxPriceController extends JeecgController<CostModelWxPrice
 		}
 
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -146,7 +130,7 @@ public class CostModelWxPriceController extends JeecgController<CostModelWxPrice
 		costModelWxPriceService.updateById(costModelWxPrice);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -161,7 +145,7 @@ public class CostModelWxPriceController extends JeecgController<CostModelWxPrice
 		costModelWxPriceService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -176,7 +160,7 @@ public class CostModelWxPriceController extends JeecgController<CostModelWxPrice
 		this.costModelWxPriceService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

module_kzks/src/main/java/org/jeecg/modules/costModelWxPrice/service/ICostModelWxPriceService.java

@@ -31,4 +31,8 @@ public interface ICostModelWxPriceService extends IService<CostModelWxPrice> {
      * @return
      */
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response, Class<CostModelWxPrice> clazz);
+
+    /**用于文件管理——导入日志——导入外协价格库*/
+    public Result<?> importExcel1(String strUrl, Class<CostModelWxPrice> clazz);
+
 }

module_kzks/src/main/java/org/jeecg/modules/costModelWxPrice/service/impl/CostModelWxPriceServiceImpl.java

@@ -16,7 +16,10 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.*;
 
 /**
@@ -161,4 +164,111 @@ public class CostModelWxPriceServiceImpl extends ServiceImpl<CostModelWxPriceMap
         }
         return Result.error("文件导入失败！");
     }
+
+    /**用于文件管理——导入日志——导入外协价格库*/
+    public Result<?> importExcel1(String strUrl, Class<CostModelWxPrice> clazz) {
+        InputStream inputStream = null;
+        try {
+            inputStream = new FileInputStream(strUrl);
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        // 获取上传文件对象
+        ImportParams params = new ImportParams();
+        params.setTitleRows(0);/*表格标题所占行数（默认是0）*/
+        params.setHeadRows(1);/*表头所占据的行数行数,默认1，代表标题占据一行*/
+        params.setNeedSave(true);
+        try {
+            //1.从excel中获取到数据放入到list中
+            List<CostModelWxPrice> list = ExcelImportUtil.importExcel(inputStream, clazz, params);
+//                System.out.println("从excel表中获取的数据");
+//                list.forEach(System.out::println);
+
+            //2.新建一个list来给list中的数据去重
+            List<CostModelWxPrice> listNew = new ArrayList<>();
+            for(CostModelWxPrice wxp:list){
+                if (!listNew.contains(wxp)) {
+                    listNew.add(wxp);
+                }
+            }
+//                System.out.println("列表去重后的数据");
+//                listNew.forEach(System.out::println);
+
+            //3.从数据库中读取全部表中数据
+//                List<CostModelWxPrice> list1 = getWXPAllDetailList();
+//                System.out.println("从数据库中取出的数据");
+//                list1.forEach(System.out::println);
+
+            Iterator<CostModelWxPrice> iterator = listNew.iterator();
+            //4.判断去重后的listNew中是否有数据已经在数据库中记录过了，如果已经保存过直接删掉
+            while(iterator.hasNext()){
+                CostModelWxPrice wxpNew = iterator.next();
+                //5.此处的条件可能更改，目前是外协项目、外协单位、单价最大值、单价最小值、计量单位都不为null的数据才能进行判断是否重复在确定是否录入数据
+                if((wxpNew.getWxProject()!=null)&(wxpNew.getWxCompany()!=null)&(wxpNew.getMaxPrice()!=null)&(wxpNew.getMinPrice()!=null)&(wxpNew.getUnit()!=null)){
+                    boolean noRepeat = true; //用来判断数据是否重复
+                    //6.从数据库中取出对应外协项目的数据内容
+                    List<CostModelWxPrice> list1 = getWXPFProDetailList(wxpNew.getWxProject());
+//                        System.out.println("从数据库中取出的数据");
+//                        list1.forEach(System.out::println);
+
+                    //7.与数据库中的数据比较，如果数据重复，则删除，如果数据不重复，计算平均值，在将整条信息进行录入
+                    for(CostModelWxPrice wxp1:list1) {
+                        //因为根据外协项目查找的数据库数据，所以不用再比较外协项目
+                        if((Objects.equals(wxpNew.getMaxPrice(), wxp1.getMaxPrice()))&(Objects.equals(wxpNew.getMinPrice(), wxp1.getMinPrice()))&(Objects.equals(wxpNew.getUnit(), wxp1.getUnit()))&(Objects.equals(wxpNew.getWxCompany(), wxp1.getWxCompany()))){
+                            iterator.remove();
+                            noRepeat = false;
+                            //System.out.println("当前元素重复，进行删除");
+                            //listNew.forEach(System.out::println);  //foreach中不能remove，不然会报错java.util.ConcurrentModificationException
+                            break;//因为wxpNew元素已经被删除了，所有此段循环可以跳过了
+                        }
+                    }
+                    if(noRepeat){
+                        try{
+                            //计算平均值并写入list
+                            wxpNew.setAvePrice(Float.toString((Float.parseFloat(wxpNew.getMaxPrice())+Float.parseFloat(wxpNew.getMinPrice()))/2));
+
+                        } catch (NumberFormatException e) {
+                            System.out.println("Float.parseFloat(String)方法执行异常");
+                            e.printStackTrace();
+                        }
+                    }
+
+                }
+                else{
+                    //System.out.println("当前关键数据内容为空，删除");
+                    iterator.remove();
+                }
+            }
+//                System.out.println("最终需要存入的数据");
+//                listNew.forEach(System.out::println);
+//                System.out.println(listNew.getClass());
+//                System.out.println(listNew.getClass().getName());
+
+            //update-begin-author:taoyan date:20190528 for:批量插入数据
+            long start = System.currentTimeMillis();
+            this.saveBatch(listNew);
+            //400条 saveBatch消耗时间1592毫秒  循环插入消耗时间1947毫秒
+            //1200条  saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒
+            log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
+            //update-end-author:taoyan date:20190528 for:批量插入数据
+            return Result.ok("文件导入成功！数据行数：" + listNew.size());
+        } catch (Exception e) {
+            //update-begin-author:taoyan date:20211124 for: 导入数据重复增加提示
+            String msg = e.getMessage();
+            log.error(msg, e);
+            if(msg!=null && msg.indexOf("Duplicate entry")>=0){
+                return Result.error("文件导入失败:有重复数据！");
+            }else{
+                return Result.error("文件导入失败:" + e.getMessage());
+            }
+            //update-end-author:taoyan date:20211124 for: 导入数据重复增加提示
+        } finally {
+            try {
+                inputStream.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
 }

module_kzks/src/main/java/org/jeecg/modules/costModelXmxqCl/controller/CostModelXmxqClController.java

@@ -1,55 +1,50 @@
 package org.jeecg.modules.costModelXmxqCl.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.costModelXmxqCl.entity.CostModelXmxqCl;
-import org.jeecg.modules.costModelXmxqCl.service.ICostModelXmxqClService;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+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.costModelClPrice.service.ICostModelClPriceService;
+import org.jeecg.modules.costModelXmxqCl.entity.CostModelXmxqCl;
+import org.jeecg.modules.costModelXmxqCl.service.ICostModelXmxqClService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
 
- /**
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
  * @Description: 项目材料导入详情
  * @Author: jeecg-boot
  * @Date:   2023-09-13
  * @Version: V1.0
  */
-@Api(tags="项目材料导入详情")
+@Api(tags="..项目材料导入详情")
 @RestController
 @RequestMapping("/costModelXmxqCl/costModelXmxqCl")
 @Slf4j
 public class CostModelXmxqClController extends JeecgController<CostModelXmxqCl, ICostModelXmxqClService> {
 	@Autowired
 	private ICostModelXmxqClService costModelXmxqClService;
-	
+
+	@Autowired
+	private ICostModelClPriceService costModelClPriceService;
+
+	@ApiOperation("测试查询")
+	@GetMapping(value = "/ceshi1")
+	public Result<CostModelXmxqCl> ceshi1(CostModelXmxqCl cl) {
+		CostModelXmxqCl clxq = costModelClPriceService.selectClPriceValue(cl);
+		return Result.OK(clxq);
+	}
+
 	/**
 	 * 分页列表查询
 	 *
@@ -71,7 +66,7 @@ public class CostModelXmxqClController extends JeecgController<CostModelXmxqCl,
 		IPage<CostModelXmxqCl> pageList = costModelXmxqClService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -86,7 +81,7 @@ public class CostModelXmxqClController extends JeecgController<CostModelXmxqCl,
 		costModelXmxqClService.save(costModelXmxqCl);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -101,7 +96,7 @@ public class CostModelXmxqClController extends JeecgController<CostModelXmxqCl,
 		costModelXmxqClService.updateById(costModelXmxqCl);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -116,7 +111,7 @@ public class CostModelXmxqClController extends JeecgController<CostModelXmxqCl,
 		costModelXmxqClService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -131,7 +126,7 @@ public class CostModelXmxqClController extends JeecgController<CostModelXmxqCl,
 		this.costModelXmxqClService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

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

@@ -1,22 +1,18 @@
 package org.jeecg.modules.costModelXmxqCl.entity;
 
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
 
 /**
  * @Description: 项目材料导入详情

module_kzks/src/main/java/org/jeecg/modules/costModelXmxqWx/controller/CostModelXmxqWxController.java

@@ -1,55 +1,56 @@
 package org.jeecg.modules.costModelXmxqWx.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.costModelXmxqWx.entity.CostModelXmxqWx;
-import org.jeecg.modules.costModelXmxqWx.service.ICostModelXmxqWxService;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+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.costModelWxPrice.service.ICostModelWxPriceService;
+import org.jeecg.modules.costModelXmxqWx.entity.CostModelXmxqWx;
+import org.jeecg.modules.costModelXmxqWx.service.ICostModelXmxqWxService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
 
- /**
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
  * @Description: 项目外协导入详情
  * @Author: jeecg-boot
  * @Date:   2023-09-13
  * @Version: V1.0
  */
-@Api(tags="项目外协导入详情")
+@Api(tags="..项目外协导入详情")
 @RestController
 @RequestMapping("/costModelXmxqWx/costModelXmxqWx")
 @Slf4j
 public class CostModelXmxqWxController extends JeecgController<CostModelXmxqWx, ICostModelXmxqWxService> {
 	@Autowired
 	private ICostModelXmxqWxService costModelXmxqWxService;
-	
+
+	@Autowired
+	private ICostModelWxPriceService costModelWxPriceService;
+
+	@ApiOperation("测试查询2")
+	@GetMapping(value = "/ceshi2")
+	public Result<CostModelXmxqWx> ceshi2(CostModelXmxqWx wx) {
+		CostModelXmxqWx wxxq = costModelWxPriceService.selectWxPriceValue(wx);
+		return Result.OK(wxxq);
+	}
+
+	@ApiOperation("测试导入xxx")
+	@GetMapping(value = "/yyy")
+	public Result<?> ceshi3(String url,String xmId, String xmName) {
+		return costModelXmxqWxService.importExcel1(xmId, xmName, url,CostModelXmxqWx.class);
+	}
+
 	/**
 	 * 分页列表查询
 	 *
@@ -71,7 +72,7 @@ public class CostModelXmxqWxController extends JeecgController<CostModelXmxqWx,
 		IPage<CostModelXmxqWx> pageList = costModelXmxqWxService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -86,7 +87,7 @@ public class CostModelXmxqWxController extends JeecgController<CostModelXmxqWx,
 		costModelXmxqWxService.save(costModelXmxqWx);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -101,7 +102,7 @@ public class CostModelXmxqWxController extends JeecgController<CostModelXmxqWx,
 		costModelXmxqWxService.updateById(costModelXmxqWx);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -116,7 +117,7 @@ public class CostModelXmxqWxController extends JeecgController<CostModelXmxqWx,
 		costModelXmxqWxService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -131,7 +132,7 @@ public class CostModelXmxqWxController extends JeecgController<CostModelXmxqWx,
 		this.costModelXmxqWxService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

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

@@ -1,22 +1,18 @@
 package org.jeecg.modules.costModelXmxqWx.entity;
 
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
 
 /**
  * @Description: 项目外协导入详情
@@ -80,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/kyTaskTemp/service/IKyTaskTempService.java

@@ -1,7 +1,8 @@
 package org.jeecg.modules.kyTaskTemp.service;
 
-import org.jeecg.modules.kyTaskTemp.entity.KyTaskTemp;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.kyTaskTemp.entity.KyTaskTemp;
 
 /**
  * @Description: 任务关系映射表
@@ -11,4 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IKyTaskTempService extends IService<KyTaskTemp> {
 
+    /**用于文件管理——导入日志——导入外协价格库*/
+    public Result<?> importExcel1(String strUrl, Class<KyTaskTemp> clazz);
+
 }

module_kzks/src/main/java/org/jeecg/modules/kyTaskTemp/service/impl/KyTaskTempServiceImpl.java

@@ -1,11 +1,20 @@
 package org.jeecg.modules.kyTaskTemp.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.kyTaskTemp.entity.KyTaskTemp;
 import org.jeecg.modules.kyTaskTemp.mapper.KyTaskTempMapper;
 import org.jeecg.modules.kyTaskTemp.service.IKyTaskTempService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
 
 /**
  * @Description: 任务关系映射表
@@ -14,6 +23,52 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  * @Version: V1.0
  */
 @Service
+@Slf4j
 public class KyTaskTempServiceImpl extends ServiceImpl<KyTaskTempMapper, KyTaskTemp> implements IKyTaskTempService {
 
+
+    /**用于文件管理——导入日志——导入外协价格库*/
+    public Result<?> importExcel1(String strUrl, Class<KyTaskTemp> clazz){
+        InputStream inputStream = null;
+        try {
+            inputStream = new FileInputStream(strUrl);
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        // 获取上传文件对象
+        ImportParams params = new ImportParams();
+        params.setTitleRows(0);/*表格标题所占行数（默认是0）*/
+        params.setHeadRows(1);/*表头所占据的行数行数,默认1，代表标题占据一行*/
+        params.setNeedSave(true);
+        try {
+            List<KyTaskTemp> list = ExcelImportUtil.importExcel(inputStream, clazz, params);
+
+            //update-begin-author:taoyan date:20190528 for:批量插入数据
+            long start = System.currentTimeMillis();
+            this.saveBatch(list);
+            //400条 saveBatch消耗时间1592毫秒  循环插入消耗时间1947毫秒
+            //1200条  saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒
+            log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
+            //update-end-author:taoyan date:20190528 for:批量插入数据
+            return Result.OK("文件导入成功！数据行数：" + list.size());
+        } catch (Exception e) {
+            //update-begin-author:taoyan date:20211124 for: 导入数据重复增加提示
+            String msg = e.getMessage();
+            log.error(msg, e);
+            if(msg!=null && msg.indexOf("Duplicate entry")>=0){
+                return Result.error("文件导入失败:有重复数据！");
+            }else{
+                return Result.error("文件导入失败:" + e.getMessage());
+            }
+            //update-end-author:taoyan date:20211124 for: 导入数据重复增加提示
+        } finally {
+            try {
+                inputStream.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
 }

module_kzks/src/main/java/org/jeecg/modules/projectImportList/controller/ProjectImportListController.java

@@ -11,6 +11,10 @@ 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.config.JeecgBaseConfig;
+import org.jeecg.modules.costModelWxPrice.entity.CostModelWxPrice;
+import org.jeecg.modules.costModelWxPrice.service.ICostModelWxPriceService;
+import org.jeecg.modules.kyTaskTemp.entity.KyTaskTemp;
+import org.jeecg.modules.kyTaskTemp.service.IKyTaskTempService;
 import org.jeecg.modules.projectBudget.entity.ProjectBudget;
 import org.jeecg.modules.projectBudget.service.IProjectBudgetService;
 import org.jeecg.modules.projectImportList.dto.ProjectChb;
@@ -48,6 +52,13 @@ public class ProjectImportListController extends JeecgController<ProjectImportLi
 	@Autowired
 	@SuppressWarnings("all")
 	private IKzksProjectKmbhService kmbhService;
+	@Autowired
+	@SuppressWarnings("all")
+	private ICostModelWxPriceService wxPriceService;
+	@Autowired
+	@SuppressWarnings("all")
+	private IKyTaskTempService kyTaskTempService;
+
 
 
 	 /**
@@ -77,8 +88,12 @@ public class ProjectImportListController extends JeecgController<ProjectImportLi
 			 return budgetService.importExcel1(url, ProjectBudget.class);
 		 }else if(projectImportList.getFileType().equals("2")){ //项目费用
 			 return projectImportListService.importExcel1(url, ProjectChb.class);
-		 }else if(projectImportList.getFileType().equals("3")){ //科目编号
+		 }else if(projectImportList.getFileType().equals("3")){ //科目编号 4外协价格库  7 任务关系映射
 			 return kmbhService.importExcel1(url, KzksProjectKmbh.class);
+		 }else if(projectImportList.getFileType().equals("4")){ //4外协价格库
+			 return wxPriceService.importExcel1(url, CostModelWxPrice.class);
+		 }else if(projectImportList.getFileType().equals("7")){ //7任务关系映射
+			 return kyTaskTempService.importExcel1(url, KyTaskTemp.class);
 		 }else {
 			 return result;
 		 }