合同、收款导入(表名修改，数据来源修改)

module_kzks/src/main/java/org/jeecg/modules/contractIncomeInfoNew/controller/ContractIncomeInfoNewController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.contractIncomeInfoNew.controller;
+package org.jeecg.modules.comContractInfoExchangeNew.controller;
 
 import java.util.Arrays;
 import java.util.List;
@@ -12,8 +12,8 @@ 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.contractIncomeInfoNew.entity.ContractIncomeInfoNew;
-import org.jeecg.modules.contractIncomeInfoNew.service.IContractIncomeInfoNewService;
+import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNew;
+import org.jeecg.modules.comContractInfoExchangeNew.service.IComContractInfoExchangeNewService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -39,21 +39,21 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 导入合同、收款表
  * @Author: jeecg-boot
- * @Date:   2024-04-08
+ * @Date:   2024-04-10
  * @Version: V1.0
  */
 @Api(tags="导入合同、收款表")
 @RestController
-@RequestMapping("/contractIncomeInfoNew/contractIncomeInfoNew")
+@RequestMapping("/comContractInfoExchangeNew/comContractInfoExchangeNew")
 @Slf4j
-public class ContractIncomeInfoNewController extends JeecgController<ContractIncomeInfoNew, IContractIncomeInfoNewService> {
+public class ComContractInfoExchangeNewController extends JeecgController<ComContractInfoExchangeNew, IComContractInfoExchangeNewService> {
 	@Autowired
-	private IContractIncomeInfoNewService contractIncomeInfoNewService;
+	private IComContractInfoExchangeNewService comContractInfoExchangeNewService;
 	
 	/**
 	 * 分页列表查询
 	 *
-	 * @param contractIncomeInfoNew
+	 * @param comContractInfoExchangeNew
 	 * @param pageNo
 	 * @param pageSize
 	 * @param req
@@ -62,43 +62,43 @@ public class ContractIncomeInfoNewController extends JeecgController<ContractInc
 	//@AutoLog(value = "导入合同、收款表-分页列表查询")
 	@ApiOperation(value="导入合同、收款表-分页列表查询", notes="导入合同、收款表-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<ContractIncomeInfoNew>> queryPageList(ContractIncomeInfoNew contractIncomeInfoNew,
+	public Result<IPage<ComContractInfoExchangeNew>> queryPageList(ComContractInfoExchangeNew comContractInfoExchangeNew,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<ContractIncomeInfoNew> queryWrapper = QueryGenerator.initQueryWrapper(contractIncomeInfoNew, req.getParameterMap());
-		Page<ContractIncomeInfoNew> page = new Page<ContractIncomeInfoNew>(pageNo, pageSize);
-		IPage<ContractIncomeInfoNew> pageList = contractIncomeInfoNewService.page(page, queryWrapper);
+		QueryWrapper<ComContractInfoExchangeNew> queryWrapper = QueryGenerator.initQueryWrapper(comContractInfoExchangeNew, req.getParameterMap());
+		Page<ComContractInfoExchangeNew> page = new Page<ComContractInfoExchangeNew>(pageNo, pageSize);
+		IPage<ComContractInfoExchangeNew> pageList = comContractInfoExchangeNewService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 	
 	/**
 	 *   添加
 	 *
-	 * @param contractIncomeInfoNew
+	 * @param comContractInfoExchangeNew
 	 * @return
 	 */
 	@AutoLog(value = "导入合同、收款表-添加")
 	@ApiOperation(value="导入合同、收款表-添加", notes="导入合同、收款表-添加")
-	//@RequiresPermissions("org.jeecg.modules:contract_income_info_new:add")
+	//@RequiresPermissions("org.jeecg.modules:com_contract_info_exchange_new:add")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody ContractIncomeInfoNew contractIncomeInfoNew) {
-		contractIncomeInfoNewService.save(contractIncomeInfoNew);
+	public Result<String> add(@RequestBody ComContractInfoExchangeNew comContractInfoExchangeNew) {
+		comContractInfoExchangeNewService.save(comContractInfoExchangeNew);
 		return Result.OK("添加成功！");
 	}
 	
 	/**
 	 *  编辑
 	 *
-	 * @param contractIncomeInfoNew
+	 * @param comContractInfoExchangeNew
 	 * @return
 	 */
 	@AutoLog(value = "导入合同、收款表-编辑")
 	@ApiOperation(value="导入合同、收款表-编辑", notes="导入合同、收款表-编辑")
-	//@RequiresPermissions("org.jeecg.modules:contract_income_info_new:edit")
+	//@RequiresPermissions("org.jeecg.modules:com_contract_info_exchange_new:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody ContractIncomeInfoNew contractIncomeInfoNew) {
-		contractIncomeInfoNewService.updateById(contractIncomeInfoNew);
+	public Result<String> edit(@RequestBody ComContractInfoExchangeNew comContractInfoExchangeNew) {
+		comContractInfoExchangeNewService.updateById(comContractInfoExchangeNew);
 		return Result.OK("编辑成功!");
 	}
 	
@@ -110,10 +110,10 @@ public class ContractIncomeInfoNewController extends JeecgController<ContractInc
 	 */
 	@AutoLog(value = "导入合同、收款表-通过id删除")
 	@ApiOperation(value="导入合同、收款表-通过id删除", notes="导入合同、收款表-通过id删除")
-	//@RequiresPermissions("org.jeecg.modules:contract_income_info_new:delete")
+	//@RequiresPermissions("org.jeecg.modules:com_contract_info_exchange_new:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		contractIncomeInfoNewService.removeById(id);
+		comContractInfoExchangeNewService.removeById(id);
 		return Result.OK("删除成功!");
 	}
 	
@@ -125,10 +125,10 @@ public class ContractIncomeInfoNewController extends JeecgController<ContractInc
 	 */
 	@AutoLog(value = "导入合同、收款表-批量删除")
 	@ApiOperation(value="导入合同、收款表-批量删除", notes="导入合同、收款表-批量删除")
-	//@RequiresPermissions("org.jeecg.modules:contract_income_info_new:deleteBatch")
+	//@RequiresPermissions("org.jeecg.modules:com_contract_info_exchange_new:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.contractIncomeInfoNewService.removeByIds(Arrays.asList(ids.split(",")));
+		this.comContractInfoExchangeNewService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
 	
@@ -141,24 +141,24 @@ public class ContractIncomeInfoNewController extends JeecgController<ContractInc
 	//@AutoLog(value = "导入合同、收款表-通过id查询")
 	@ApiOperation(value="导入合同、收款表-通过id查询", notes="导入合同、收款表-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<ContractIncomeInfoNew> queryById(@RequestParam(name="id",required=true) String id) {
-		ContractIncomeInfoNew contractIncomeInfoNew = contractIncomeInfoNewService.getById(id);
-		if(contractIncomeInfoNew==null) {
+	public Result<ComContractInfoExchangeNew> queryById(@RequestParam(name="id",required=true) String id) {
+		ComContractInfoExchangeNew comContractInfoExchangeNew = comContractInfoExchangeNewService.getById(id);
+		if(comContractInfoExchangeNew==null) {
 			return Result.error("未找到对应数据");
 		}
-		return Result.OK(contractIncomeInfoNew);
+		return Result.OK(comContractInfoExchangeNew);
 	}
 
     /**
     * 导出excel
     *
     * @param request
-    * @param contractIncomeInfoNew
+    * @param comContractInfoExchangeNew
     */
-    //@RequiresPermissions("org.jeecg.modules:contract_income_info_new:exportXls")
+    //@RequiresPermissions("org.jeecg.modules:com_contract_info_exchange_new:exportXls")
     @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, ContractIncomeInfoNew contractIncomeInfoNew) {
-        return super.exportXls(request, contractIncomeInfoNew, ContractIncomeInfoNew.class, "导入合同、收款表");
+    public ModelAndView exportXls(HttpServletRequest request, ComContractInfoExchangeNew comContractInfoExchangeNew) {
+        return super.exportXls(request, comContractInfoExchangeNew, ComContractInfoExchangeNew.class, "导入合同、收款表");
     }
 
     /**
@@ -168,10 +168,10 @@ public class ContractIncomeInfoNewController extends JeecgController<ContractInc
     * @param response
     * @return
     */
-    //@RequiresPermissions("contract_income_info_new:importExcel")
+    //@RequiresPermissions("com_contract_info_exchange_new:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, ContractIncomeInfoNew.class);
+        return super.importExcel(request, response, ComContractInfoExchangeNew.class);
     }
 
 }

module_kzks/src/main/java/org/jeecg/modules/contractIncomeInfoNew/entity/ContractIncomeInfoNew.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.contractIncomeInfoNew.entity;
+package org.jeecg.modules.comContractInfoExchangeNew.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
@@ -7,8 +7,6 @@ import java.math.BigDecimal;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.converters.bigdecimal.BigDecimalNumberConverter;
-import com.alibaba.excel.converters.bigdecimal.BigDecimalStringConverter;
 import com.alibaba.excel.converters.date.DateStringConverter;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -27,338 +25,339 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 导入合同、收款表
  * @Author: jeecg-boot
- * @Date:   2024-04-08
+ * @Date:   2024-04-10
  * @Version: V1.0
  */
 @Data
-@TableName("contract_income_info_new")
+@TableName("com_contract_info_exchange_new")
 @Accessors(chain = false)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="contract_income_info_new对象", description="导入合同、收款表")
-public class ContractIncomeInfoNew implements Serializable {
+@ApiModel(value="com_contract_info_exchange_new对象", description="导入合同、收款表")
+public class ComContractInfoExchangeNew implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**id*/
+    @TableId(type = IdType.ASSIGN_ID)
     @ExcelIgnore
-    @ApiModelProperty(value = "主键")
+    @ApiModelProperty(value = "id")
     private java.lang.String id;
-	/**创建人*/
+    /**创建人*/
     @ExcelIgnore
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
-	/**创建日期*/
+    /**创建日期*/
     @ExcelIgnore
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @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;
-	/**更新人*/
+    /**更新人*/
     @ExcelIgnore
     @ApiModelProperty(value = "更新人")
     private java.lang.String updateBy;
-	/**更新日期*/
+    /**更新日期*/
     @ExcelIgnore
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @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;
-	/**序号*/
+    /**序号*/
 //	@Excel(name = "序号", width = 15)
     @ExcelProperty(value = "序号")
     @ApiModelProperty(value = "序号")
     private java.lang.String serialno;
-	/**ID*/
+    /**ID*/
 //	@Excel(name = "ID", width = 15)
     @ExcelProperty(value = "ID")
     @ApiModelProperty(value = "ID")
     private java.lang.String htid;
-	/**主合同编号*/
+    /**主合同编号*/
 //	@Excel(name = "主合同编号", width = 15)
     @ExcelProperty(value = "主合同编号")
     @ApiModelProperty(value = "主合同编号")
     private java.lang.String zhtbh;
-	/**合同编号*/
+    /**合同编号*/
 //	@Excel(name = "合同编号", width = 15)
     @ExcelProperty(value = "合同编号")
     @ApiModelProperty(value = "合同编号")
     private java.lang.String htbh;
-	/**合同名称*/
+    /**合同名称*/
 //	@Excel(name = "合同名称", width = 15)
     @ExcelProperty(value = "合同名称")
     @ApiModelProperty(value = "合同名称")
     private java.lang.String htname;
-	/**签署日期*/
+    /**签署日期*/
 //	@Excel(name = "签署日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
     @ExcelProperty(value = "签署日期", converter = DateStringConverter.class)
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @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 qsrq;
-	/**甲方（付款方）*/
+    /**甲方（付款方）*/
 //	@Excel(name = "甲方（付款方）", width = 15)
     @ExcelProperty(value = "甲方（付款方）")
     @ApiModelProperty(value = "甲方（付款方）")
     private java.lang.String jf;
-	/**甲方简称*/
+    /**甲方简称*/
 //	@Excel(name = "甲方简称", width = 15)
     @ExcelProperty(value = "甲方简称")
     @ApiModelProperty(value = "甲方简称")
     private java.lang.String jfjc;
-	/**合同金额*/
+    /**合同金额*/
 //	@Excel(name = "合同金额", width = 15)    //单元格常规格式用这个
 //    @ExcelProperty(converter = BigDecimalStringConverter.class)   //单元格文本格式用这个
 //    @ExcelProperty(converter = BigDecimalNumberConverter.class)  //单元格数值格式用这个
     @ExcelProperty(value = "合同金额")
     @ApiModelProperty(value = "合同金额")
     private java.math.BigDecimal htje;
-	/**自筹*/
+    /**自筹*/
 //	@Excel(name = "自筹", width = 15)
 //    @ExcelProperty(converter = BigDecimalStringConverter.class)
 //    @ExcelProperty(converter = BigDecimalNumberConverter.class)
     @ExcelProperty(value = "自筹")
     @ApiModelProperty(value = "自筹")
     private java.math.BigDecimal zc;
-	/**合同到款*/
+    /**合同到款*/
 //	@Excel(name = "合同到款", width = 15)
 //    @ExcelProperty(converter = BigDecimalStringConverter.class)
 //    @ExcelProperty(converter = BigDecimalNumberConverter.class)
     @ExcelProperty(value = "合同到款")
     @ApiModelProperty(value = "合同到款")
     private java.math.BigDecimal htdk;
-	/**合同待收款*/
+    /**合同待收款*/
 //	@Excel(name = "合同待收款", width = 15)
 //    @ExcelProperty(converter = BigDecimalStringConverter.class)
 //    @ExcelProperty(converter = BigDecimalNumberConverter.class)
     @ExcelProperty(value = "合同待收款")
     @ApiModelProperty(value = "合同待收款")
     private java.math.BigDecimal htdsk;
-	/**合同已开票*/
+    /**合同已开票*/
 //	@Excel(name = "合同已开票", width = 15)
 //    @ExcelProperty(converter = BigDecimalStringConverter.class)
 //    @ExcelProperty(converter = BigDecimalNumberConverter.class)
     @ExcelProperty(value = "合同已开票")
     @ApiModelProperty(value = "合同已开票")
     private java.math.BigDecimal htykp;
-	/**合同待开票*/
+    /**合同待开票*/
 //	@Excel(name = "合同待开票", width = 15)
 //    @ExcelProperty(converter = BigDecimalStringConverter.class)
 //    @ExcelProperty(converter = BigDecimalNumberConverter.class)
     @ExcelProperty(value = "合同待开票")
     @ApiModelProperty(value = "合同待开票")
     private java.math.BigDecimal htdkp;
-	/**任务编号*/
+    /**任务编号*/
 //	@Excel(name = "任务编号", width = 15)
     @ExcelProperty(value = "任务编号")
     @ApiModelProperty(value = "任务编号")
     private java.lang.String rwbh;
-	/**任务名称*/
+    /**任务名称*/
 //	@Excel(name = "任务名称", width = 15)
     @ExcelProperty(value = "任务名称")
     @ApiModelProperty(value = "任务名称")
     private java.lang.String rwname;
-	/**产品型号*/
+    /**产品型号*/
 //	@Excel(name = "产品型号", width = 15)
     @ExcelProperty(value = "产品型号")
     @ApiModelProperty(value = "产品型号")
     private java.lang.String cpxh;
-	/**阶段*/
+    /**阶段*/
 //	@Excel(name = "阶段", width = 15)
     @ExcelProperty(value = "阶段")
     @ApiModelProperty(value = "阶段")
     private java.lang.String jd;
-	/**研制部门*/
+    /**研制部门*/
 //	@Excel(name = "研制部门", width = 15)
     @ExcelProperty(value = "研制部门")
     @ApiModelProperty(value = "研制部门")
     private java.lang.String yzbm;
-	/**任务应收款*/
+    /**任务应收款*/
 //	@Excel(name = "任务应收款", width = 15)
 //    @ExcelProperty(converter = BigDecimalStringConverter.class)
 //    @ExcelProperty(converter = BigDecimalNumberConverter.class)
     @ExcelProperty(value = "任务应收款")
     @ApiModelProperty(value = "任务应收款")
     private java.math.BigDecimal rwyingsk;
-	/**任务已收款*/
+    /**任务已收款*/
 //	@Excel(name = "任务已收款", width = 15)
 //    @ExcelProperty(converter = BigDecimalStringConverter.class)
 //    @ExcelProperty(converter = BigDecimalNumberConverter.class)
     @ExcelProperty(value = "任务已收款")
     @ApiModelProperty(value = "任务已收款")
     private java.math.BigDecimal rwyisk;
-	/**发票类型1*/
+    /**发票类型1*/
 //	@Excel(name = "发票类型1", width = 15)
     @ExcelProperty(value = "发票类型1")
     @ApiModelProperty(value = "发票类型1")
     private java.lang.String fptypeone;
-	/**发票1金额*/
+    /**发票1金额*/
 //	@Excel(name = "发票1金额", width = 15)
 //    @ExcelProperty(converter = BigDecimalStringConverter.class)
 //    @ExcelProperty(converter = BigDecimalNumberConverter.class)
     @ExcelProperty(value = "发票1金额")
     @ApiModelProperty(value = "发票1金额")
     private java.math.BigDecimal fpjeone;
-	/**1已开票额*/
+    /**1已开票额*/
 //	@Excel(name = "1已开票额", width = 15)
 //    @ExcelProperty(converter = BigDecimalStringConverter.class)
 //    @ExcelProperty(converter = BigDecimalNumberConverter.class)
     @ExcelProperty(value = "1已开票额")
     @ApiModelProperty(value = "1已开票额")
     private java.math.BigDecimal ykpeone;
-	/**发票类型2*/
+    /**发票类型2*/
 //	@Excel(name = "发票类型2", width = 15)
     @ExcelProperty(value = "发票类型2")
     @ApiModelProperty(value = "发票类型2")
     private java.lang.String fptypetwo;
-	/**发票2金额*/
+    /**发票2金额*/
 //	@Excel(name = "发票2金额", width = 15)
 //    @ExcelProperty(converter = BigDecimalStringConverter.class)
 //    @ExcelProperty(converter = BigDecimalNumberConverter.class)
     @ExcelProperty(value = "发票2金额")
     @ApiModelProperty(value = "发票2金额")
     private java.math.BigDecimal fpjetwo;
-	/**2已开票额*/
+    /**2已开票额*/
 //	@Excel(name = "2已开票额", width = 15)
 //    @ExcelProperty(converter = BigDecimalStringConverter.class)
 //    @ExcelProperty(converter = BigDecimalNumberConverter.class)
     @ExcelProperty(value = "2已开票额")
     @ApiModelProperty(value = "2已开票额")
     private java.math.BigDecimal ykpetwo;
-	/**合同主管部门*/
+    /**合同主管部门*/
 //	@Excel(name = "合同主管部门", width = 15)
     @ExcelProperty(value = "合同主管部门")
     @ApiModelProperty(value = "合同主管部门")
     private java.lang.String htzgbm;
-	/**业务员*/
+    /**业务员*/
 //	@Excel(name = "业务员", width = 15)
     @ExcelProperty(value = "业务员")
     @ApiModelProperty(value = "业务员")
     private java.lang.String ywy;
-	/**合同履行情况*/
+    /**合同履行情况*/
 //	@Excel(name = "合同履行情况", width = 15)
     @ExcelProperty(value = "合同履行情况")
     @ApiModelProperty(value = "合同履行情况")
     private java.lang.String htlxqk;
-	/**合同状态说明*/
+    /**合同状态说明*/
 //	@Excel(name = "合同状态说明", width = 15)
     @ExcelProperty(value = "合同状态说明")
     @ApiModelProperty(value = "合同状态说明")
     private java.lang.String htztsm;
-	/**收款单号*/
+    /**收款单号*/
 //	@Excel(name = "收款单号", width = 15)
     @ExcelProperty(value = "收款单号")
     @ApiModelProperty(value = "收款单号")
     private java.lang.String skdh;
-	/**执行状态*/
+    /**执行状态*/
 //	@Excel(name = "执行状态", width = 15)
     @ExcelProperty(value = "执行状态")
     @ApiModelProperty(value = "执行状态")
     private java.lang.String zxzt;
-	/**付款方名称*/
+    /**付款方名称*/
 //	@Excel(name = "付款方名称", width = 15)
     @ExcelProperty(value = "付款方名称")
     @ApiModelProperty(value = "付款方名称")
     private java.lang.String fkfmc;
-	/**用户简称*/
+    /**用户简称*/
 //	@Excel(name = "用户简称", width = 15)
     @ExcelProperty(value = "用户简称")
     @ApiModelProperty(value = "用户简称")
     private java.lang.String yhjc;
-	/**合同类型*/
+    /**合同类型*/
 //	@Excel(name = "合同类型", width = 15)
     @ExcelProperty(value = "合同类型")
     @ApiModelProperty(value = "合同类型")
     private java.lang.String httype;
-	/**型号*/
+    /**型号*/
 //	@Excel(name = "型号", width = 15)
     @ExcelProperty(value = "型号")
     @ApiModelProperty(value = "型号")
     private java.lang.String xh;
-	/**数量*/
+    /**数量*/
 //	@Excel(name = "数量", width = 15)
     @ExcelProperty(value = "数量")
     @ApiModelProperty(value = "数量")
     private java.lang.Integer sl;
-	/**收款总金额*/
+    /**收款总金额*/
 //	@Excel(name = "收款总金额", width = 15)
 //    @ExcelProperty(converter = BigDecimalStringConverter.class, index = 14)
 //    @ExcelProperty(value = "收款总金额", converter = BigDecimalNumberConverter.class)
     @ExcelProperty(value = "收款总金额")
     @ApiModelProperty(value = "收款总金额")
     private java.math.BigDecimal skzje;
-	/** 任务收款金额 */
+    /** 任务收款金额 */
 //	@Excel(name = " 任务收款金额 ", width = 15)
 //    @ExcelProperty(converter = BigDecimalStringConverter.class, index = 15)
 //    @ExcelProperty(value = "任务收款金额", converter = BigDecimalNumberConverter.class)
     @ExcelProperty(value = "任务收款金额")
     @ApiModelProperty(value = " 任务收款金额 ")
     private java.math.BigDecimal rwskje;
-	/**到款日期/汇票到期日期*/
+    /**到款日期/汇票到期日期*/
 //	@Excel(name = "到款日期/汇票到期日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
     @ExcelProperty(value = "到款日期/汇票到期日期", converter = DateStringConverter.class)
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @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 dkrq;
-	/**收款类型*/
+    /**收款类型*/
 //	@Excel(name = "收款类型", width = 15)
     @ExcelProperty(value = "收款类型")
     @ApiModelProperty(value = "收款类型")
     private java.lang.String sktype;
-	/**收款科目代码*/
+    /**收款科目代码*/
 //	@Excel(name = "收款科目代码", width = 15)
     @ExcelProperty(value = "收款科目代码")
     @ApiModelProperty(value = "收款科目代码")
     private java.lang.String skkmdm;
-	/**凭证号*/
+    /**凭证号*/
 //	@Excel(name = "凭证号", width = 15)
     @ExcelProperty(value = "凭证号")
     @ApiModelProperty(value = "凭证号")
     private java.lang.String pzh;
-	/**业务部门*/
+    /**业务部门*/
 //	@Excel(name = "业务部门", width = 15)
     @ExcelProperty(value = "业务部门")
     @ApiModelProperty(value = "业务部门")
     private java.lang.String ywbm;
-	/**录入人*/
+    /**录入人*/
 //	@Excel(name = "录入人", width = 15)
     @ExcelProperty(value = "录入人")
     @ApiModelProperty(value = "录入人")
     private java.lang.String lrr;
-	/**录入日期*/
+    /**录入日期*/
 //	@Excel(name = "录入日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
     @ExcelProperty(value = "录入日期", converter = DateStringConverter.class)
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @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 lrrq;
-	/**交易流水号*/
+    /**交易流水号*/
 //	@Excel(name = "交易流水号", width = 15)
     @ExcelProperty(value = "交易流水号")
     @ApiModelProperty(value = "交易流水号")
     private java.lang.String jylsh;
-	/**交易ID*/
+    /**交易ID*/
 //	@Excel(name = "交易ID", width = 15)
     @ExcelProperty(value = "交易ID")
     @ApiModelProperty(value = "交易ID")
     private java.lang.String jyid;
-	/**汇票号*/
+    /**汇票号*/
 //	@Excel(name = "汇票号", width = 15)
     @ExcelProperty(value = "汇票号")
     @ApiModelProperty(value = "汇票号")
     private java.lang.String hph;
-	/**汇票ID*/
+    /**汇票ID*/
 //	@Excel(name = "汇票ID", width = 15)
     @ExcelProperty(value = "汇票ID")
     @ApiModelProperty(value = "汇票ID")
     private java.lang.String hpid;
-	/**收款单位*/
+    /**收款单位*/
 //	@Excel(name = "收款单位", width = 15)
     @ExcelProperty(value = "收款单位")
     @ApiModelProperty(value = "收款单位")
     private java.lang.String skdw;
-	/**数据来源：1合同导入  2收款导入*/
-//	@Excel(name = "数据来源：1合同导入  2收款导入", width = 15)
-    @ApiModelProperty(value = "数据来源：1合同导入  2收款导入")
+    /**数据来源：20合同导入  20收款导入*/
+//	@Excel(name = "数据来源：20合同导入  40收款导入", width = 15)
+    @ApiModelProperty(value = "数据来源：20合同导入  40收款导入")
     private java.lang.Integer sjly;
+
 }

module_kzks/src/main/java/org/jeecg/modules/comContractInfoExchangeNew/mapper/ComContractInfoExchangeNewMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.comContractInfoExchangeNew.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNew;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 导入合同、收款表
+ * @Author: jeecg-boot
+ * @Date:   2024-04-10
+ * @Version: V1.0
+ */
+public interface ComContractInfoExchangeNewMapper extends BaseMapper<ComContractInfoExchangeNew> {
+
+}

module_kzks/src/main/java/org/jeecg/modules/contractIncomeInfoNew/mapper/xml/ContractIncomeInfoNewMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.contractIncomeInfoNew.mapper.ContractIncomeInfoNewMapper">
+<mapper namespace="org.jeecg.modules.comContractInfoExchangeNew.mapper.ComContractInfoExchangeNewMapper">
 
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/contractIncomeInfoNew/monitor/ContractIncomeInfoNewListener.java

@@ -1,16 +1,12 @@
-package org.jeecg.modules.contractIncomeInfoNew.monitor;
+package org.jeecg.modules.comContractInfoExchangeNew.monitor;
 
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
-import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNew;
+import org.jeecg.modules.comContractInfoExchangeNew.service.IComContractInfoExchangeNewService;
 import org.jeecg.modules.contractIncomeInfoNew.entity.ContractIncomeInfoNew;
 import org.jeecg.modules.contractIncomeInfoNew.service.IContractIncomeInfoNewService;
-import org.jeecg.modules.message.websocket.WebSocket;
-import org.jeecg.modules.wzOutboundOrderBNew.entity.WzOutboundOrderBNew;
-import org.jeecg.modules.wzOutboundOrderBNew.service.IWzOutboundOrderBNewService;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,41 +16,37 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 /**
- * ClassName: ContractIncomeInfoNewListener
- * Package: org.jeecg.modules.contractIncomeInfoNew.monitor
- * Description:  监听器
+ * ClassName: ComContractInfoExchangeNewListener
+ * Package: org.jeecg.modules.comContractInfoExchangeNew.monitor
+ * Description:
  *
  * @Author sl
- * @Create 2024/4/8 17:06
+ * @Create 2024/4/10 15:48
  * @Version 1.0
  */
 @Slf4j
-public class ContractIncomeInfoNewListener extends AnalysisEventListener<ContractIncomeInfoNew> {
-    private IContractIncomeInfoNewService contractIncomeInfoNewService;
+public class ComContractInfoExchangeNewListener extends AnalysisEventListener<ComContractInfoExchangeNew> {
+
+    private IComContractInfoExchangeNewService comContractInfoExchangeNewService;
 
     //每隔1000条存储数据库，实际使用中可以3000条，然后清理list，方便内存回收
     private static final int BATCH_COUNT = 3000;
-    private static final List<ContractIncomeInfoNew> list = new CopyOnWriteArrayList<>(); // 存放合同数据的集合
+    private static final List<ComContractInfoExchangeNew> list = new CopyOnWriteArrayList<>(); // 存放合同数据的集合
     private Integer sjly = 1;
 
-    public ContractIncomeInfoNewListener() {
+    public ComContractInfoExchangeNewListener() {
     }
 
-    public ContractIncomeInfoNewListener(IContractIncomeInfoNewService contractIncomeInfoNewService, Integer sjly) {
-        this.contractIncomeInfoNewService = contractIncomeInfoNewService;
+    public ComContractInfoExchangeNewListener(IComContractInfoExchangeNewService comContractInfoExchangeNewService, Integer sjly) {
+        this.comContractInfoExchangeNewService = comContractInfoExchangeNewService;
         this.sjly = sjly;
     }
 
-//    public ContractIncomeInfoNewListener(IContractIncomeInfoNewService contractIncomeInfoNewService, WebSocket webSocket) {
-//        this.contractIncomeInfoNewService = contractIncomeInfoNewService;
-//        this.webSocket = webSocket;
-//    }
-
     @Override
-    public void invoke(ContractIncomeInfoNew contractIncomeInfoNew, AnalysisContext analysisContext){
+    public void invoke(ComContractInfoExchangeNew comContractInfoExchangeNew, AnalysisContext analysisContext){
 //        System.out.println(wzOutboundOrderBNew);
-        contractIncomeInfoNew.setSjly(sjly);
-        list.add(contractIncomeInfoNew);
+        comContractInfoExchangeNew.setSjly(sjly);
+        list.add(comContractInfoExchangeNew);
 //        System.out.println(list);
         //达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
         if(list.size() >= BATCH_COUNT){
@@ -79,7 +71,7 @@ public class ContractIncomeInfoNewListener extends AnalysisEventListener<Contrac
             log.info("{}条数据，开始存储数据库！", list.size());
             int sonListSize = list.size() / 8;  // 计算将wzList分成8份之后每个子集合的大小
 
-            List<List<ContractIncomeInfoNew>> sonList = new ArrayList<>(); // 用于存放 子集合 的list
+            List<List<ComContractInfoExchangeNew>> sonList = new ArrayList<>(); // 用于存放 子集合 的list
             for (int i = 0; i < 8; i++) {
                 int startIndex = i * sonListSize;
                 int endIndex = (i + 1) * sonListSize;
@@ -87,49 +79,49 @@ public class ContractIncomeInfoNewListener extends AnalysisEventListener<Contrac
                     endIndex = list.size();
                 }
                 // 根据起始索引、终止索引进行截取
-                List<ContractIncomeInfoNew> listSub = list.subList(startIndex, endIndex);
+                List<ComContractInfoExchangeNew> listSub = list.subList(startIndex, endIndex);
                 sonList.add(listSub);
             }
             // 八个线程同步保存数据
             if (!sonList.isEmpty()){
                 if (!sonList.get(0).isEmpty()){
                     threadPoolExecutors.submit(() -> {
-                        contractIncomeInfoNewService.saveBatch(sonList.get(0));
+                        comContractInfoExchangeNewService.saveBatch(sonList.get(0));
                     });
                 }
                 if (!sonList.get(1).isEmpty()){
                     threadPoolExecutors.submit(() -> {
-                        contractIncomeInfoNewService.saveBatch(sonList.get(1));
+                        comContractInfoExchangeNewService.saveBatch(sonList.get(1));
                     });
                 }
                 if (!sonList.get(2).isEmpty()){
                     threadPoolExecutors.submit(() -> {
-                        contractIncomeInfoNewService.saveBatch(sonList.get(2));
+                        comContractInfoExchangeNewService.saveBatch(sonList.get(2));
                     });
                 }
                 if (!sonList.get(3).isEmpty()){
                     threadPoolExecutors.submit(() -> {
-                        contractIncomeInfoNewService.saveBatch(sonList.get(3));
+                        comContractInfoExchangeNewService.saveBatch(sonList.get(3));
                     });
                 }
                 if (!sonList.get(4).isEmpty()){
                     threadPoolExecutors.submit(() -> {
-                        contractIncomeInfoNewService.saveBatch(sonList.get(4));
+                        comContractInfoExchangeNewService.saveBatch(sonList.get(4));
                     });
                 }
                 if (!sonList.get(5).isEmpty()){
                     threadPoolExecutors.submit(() -> {
-                        contractIncomeInfoNewService.saveBatch(sonList.get(5));
+                        comContractInfoExchangeNewService.saveBatch(sonList.get(5));
                     });
                 }
                 if (!sonList.get(6).isEmpty()){
                     threadPoolExecutors.submit(() -> {
-                        contractIncomeInfoNewService.saveBatch(sonList.get(6));
+                        comContractInfoExchangeNewService.saveBatch(sonList.get(6));
                     });
                 }
                 if (!sonList.get(7).isEmpty()){
                     threadPoolExecutors.submit(() -> {
-                        contractIncomeInfoNewService.saveBatch(sonList.get(7));
+                        comContractInfoExchangeNewService.saveBatch(sonList.get(7));
                     });
                 }
             }
@@ -145,5 +137,4 @@ public class ContractIncomeInfoNewListener extends AnalysisEventListener<Contrac
     }
 
 
-
 }

module_kzks/src/main/java/org/jeecg/modules/comContractInfoExchangeNew/service/IComContractInfoExchangeNewService.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.comContractInfoExchangeNew.service;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNew;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.contractIncomeInfoNew.entity.ContractIncomeInfoNew;
+
+/**
+ * @Description: 导入合同、收款表
+ * @Author: jeecg-boot
+ * @Date:   2024-04-10
+ * @Version: V1.0
+ */
+public interface IComContractInfoExchangeNewService extends IService<ComContractInfoExchangeNew> {
+
+    /* sjly:数据来源：20合同导入 40收款导入 */
+    Result<?> importExcel1(String strUrl, Class<ComContractInfoExchangeNew> clazz, Integer sjly);
+
+}

module_kzks/src/main/java/org/jeecg/modules/contractIncomeInfoNew/service/impl/ContractIncomeInfoNewServiceImpl.java

@@ -1,14 +1,14 @@
-package org.jeecg.modules.contractIncomeInfoNew.service.impl;
+package org.jeecg.modules.comContractInfoExchangeNew.service.impl;
 
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelReader;
 import com.alibaba.excel.read.metadata.ReadSheet;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.contractIncomeInfoNew.entity.ContractIncomeInfoNew;
-import org.jeecg.modules.contractIncomeInfoNew.mapper.ContractIncomeInfoNewMapper;
-import org.jeecg.modules.contractIncomeInfoNew.monitor.ContractIncomeInfoNewListener;
-import org.jeecg.modules.contractIncomeInfoNew.service.IContractIncomeInfoNewService;
+import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNew;
+import org.jeecg.modules.comContractInfoExchangeNew.mapper.ComContractInfoExchangeNewMapper;
+import org.jeecg.modules.comContractInfoExchangeNew.monitor.ComContractInfoExchangeNewListener;
+import org.jeecg.modules.comContractInfoExchangeNew.service.IComContractInfoExchangeNewService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -18,20 +18,19 @@ import java.io.File;
 /**
  * @Description: 导入合同、收款表
  * @Author: jeecg-boot
- * @Date:   2024-04-08
+ * @Date:   2024-04-10
  * @Version: V1.0
  */
-@Service
 @Slf4j
-public class ContractIncomeInfoNewServiceImpl extends ServiceImpl<ContractIncomeInfoNewMapper, ContractIncomeInfoNew> implements IContractIncomeInfoNewService {
+@Service
+public class ComContractInfoExchangeNewServiceImpl extends ServiceImpl<ComContractInfoExchangeNewMapper, ComContractInfoExchangeNew> implements IComContractInfoExchangeNewService {
 
-    /* sjly:数据来源：1合同导入 2收款导入 */
+    /* sjly:数据来源：20合同导入 40收款导入 */
     @Override
-    public Result<?> importExcel1(String strUrl, Class<ContractIncomeInfoNew> clazz, Integer sjly){
+    public Result<?> importExcel1(String strUrl, Class<ComContractInfoExchangeNew> clazz, Integer sjly){
         long startTime = System.currentTimeMillis();
 //        Object data = new Object();
-        ExcelReader excelReader = EasyExcel.read(new File(strUrl), clazz, new ContractIncomeInfoNewListener(this, sjly)).build();
-//        ExcelReader excelReader = EasyExcel.read(new File(strUrl), Object.class, new ContractIncomeInfoNewListenerC(data, this, sjly)).build();
+        ExcelReader excelReader = EasyExcel.read(new File(strUrl), clazz, new ComContractInfoExchangeNewListener(this, sjly)).build();
         ReadSheet readSheet = EasyExcel.readSheet(0).build();
         excelReader.read(readSheet);
         //这里千万别忘记关闭，读的时候会创建临时文件，到时磁盘会崩的
@@ -42,4 +41,5 @@ public class ContractIncomeInfoNewServiceImpl extends ServiceImpl<ContractIncome
         return Result.ok();
     }
 
+
 }

module_kzks/src/main/java/org/jeecg/modules/contractIncomeInfoNew/mapper/ContractIncomeInfoNewMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.contractIncomeInfoNew.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.contractIncomeInfoNew.entity.ContractIncomeInfoNew;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 导入合同、收款表
- * @Author: jeecg-boot
- * @Date:   2024-04-08
- * @Version: V1.0
- */
-public interface ContractIncomeInfoNewMapper extends BaseMapper<ContractIncomeInfoNew> {
-
-}

module_kzks/src/main/java/org/jeecg/modules/contractIncomeInfoNew/service/IContractIncomeInfoNewService.java

@@ -1,19 +0,0 @@
-package org.jeecg.modules.contractIncomeInfoNew.service;
-
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.contractIncomeInfoNew.entity.ContractIncomeInfoNew;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.wzOutboundOrderBNew.entity.WzOutboundOrderBNew;
-
-/**
- * @Description: 导入合同、收款表
- * @Author: jeecg-boot
- * @Date:   2024-04-08
- * @Version: V1.0
- */
-public interface IContractIncomeInfoNewService extends IService<ContractIncomeInfoNew> {
-
-    /* sjly:数据来源：1合同导入 2收款导入 */
-    Result<?> importExcel1(String strUrl, Class<ContractIncomeInfoNew> clazz, Integer sjly);
-
-}

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

@@ -11,8 +11,8 @@ 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.contractIncomeInfoNew.entity.ContractIncomeInfoNew;
-import org.jeecg.modules.contractIncomeInfoNew.service.IContractIncomeInfoNewService;
+import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNew;
+import org.jeecg.modules.comContractInfoExchangeNew.service.IComContractInfoExchangeNewService;
 import org.jeecg.modules.costModelWxPrice.entity.CostModelWxPrice;
 import org.jeecg.modules.costModelWxPrice.service.ICostModelWxPriceService;
 import org.jeecg.modules.kpiImportList.entity.KpiImportList;
@@ -88,7 +88,7 @@ public class ProjectImportListController extends JeecgController<ProjectImportLi
 
     @Autowired
     @SuppressWarnings("all")
-    private IContractIncomeInfoNewService contractIncomeInfoNewService;
+    private IComContractInfoExchangeNewService comContractInfoExchangeNewService;
 
 
     /**
@@ -133,10 +133,10 @@ public class ProjectImportListController extends JeecgController<ProjectImportLi
             return wzOutboundOrderBNewService.importExcel1(url, WzOutboundOrderBNew.class);
 //            return wzOutboundOrderBNewService.importExcelNew(url, WzOutboundOrderBNew.class);
         } else if (projectImportList.getFileType().equals("16")){//合同导入
-            return contractIncomeInfoNewService.importExcel1(url, ContractIncomeInfoNew.class, 1);
+            return comContractInfoExchangeNewService.importExcel1(url, ComContractInfoExchangeNew.class, 20);
 //            return wzOutboundOrderBNewService.importExcelNew(url, WzOutboundOrderBNew.class);
         } else if (projectImportList.getFileType().equals("17")){//收款导入
-            return contractIncomeInfoNewService.importExcel1(url, ContractIncomeInfoNew.class, 2);
+            return comContractInfoExchangeNewService.importExcel1(url, ComContractInfoExchangeNew.class, 40);
 //            return wzOutboundOrderBNewService.importExcelNew(url, WzOutboundOrderBNew.class);
         } else if (projectImportList.getFileType().equals("15")){
             return kyTaskInfoNewService.importExcel1(url, KyTaskInfoNew.class);