专用费、事务费、外协费导入并解析到数据表——未完

module_kzks/src/main/java/org/jeecg/modules/projectBudget/controller/ProjectBudgetController.java

@@ -0,0 +1,177 @@
+package org.jeecg.modules.projectBudget.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.projectBudget.entity.ProjectBudget;
+import org.jeecg.modules.projectBudget.service.IProjectBudgetService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.system.base.controller.JeecgController;
+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;
+
+ /**
+ * @Description: 项目预算
+ * @Author: jeecg-boot
+ * @Date:   2023-08-10
+ * @Version: V1.0
+ */
+@Api(tags="项目预算")
+@RestController
+@RequestMapping("/projectBudget/projectBudget")
+@Slf4j
+public class ProjectBudgetController extends JeecgController<ProjectBudget, IProjectBudgetService> {
+	@Autowired
+	private IProjectBudgetService projectBudgetService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param projectBudget
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "项目预算-分页列表查询")
+	@ApiOperation(value="项目预算-分页列表查询", notes="项目预算-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<ProjectBudget>> queryPageList(ProjectBudget projectBudget,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ProjectBudget> queryWrapper = QueryGenerator.initQueryWrapper(projectBudget, req.getParameterMap());
+		Page<ProjectBudget> page = new Page<ProjectBudget>(pageNo, pageSize);
+		IPage<ProjectBudget> pageList = projectBudgetService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param projectBudget
+	 * @return
+	 */
+	@AutoLog(value = "项目预算-添加")
+	@ApiOperation(value="项目预算-添加", notes="项目预算-添加")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_budget:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody ProjectBudget projectBudget) {
+		projectBudgetService.save(projectBudget);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param projectBudget
+	 * @return
+	 */
+	@AutoLog(value = "项目预算-编辑")
+	@ApiOperation(value="项目预算-编辑", notes="项目预算-编辑")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_budget:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody ProjectBudget projectBudget) {
+		projectBudgetService.updateById(projectBudget);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "项目预算-通过id删除")
+	@ApiOperation(value="项目预算-通过id删除", notes="项目预算-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_budget:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		projectBudgetService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "项目预算-批量删除")
+	@ApiOperation(value="项目预算-批量删除", notes="项目预算-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_budget:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.projectBudgetService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "项目预算-通过id查询")
+	@ApiOperation(value="项目预算-通过id查询", notes="项目预算-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<ProjectBudget> queryById(@RequestParam(name="id",required=true) String id) {
+		ProjectBudget projectBudget = projectBudgetService.getById(id);
+		if(projectBudget==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(projectBudget);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param projectBudget
+    */
+    //@RequiresPermissions("org.jeecg.modules:kzks_project_budget:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ProjectBudget projectBudget) {
+        return super.exportXls(request, projectBudget, ProjectBudget.class, "项目预算");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("kzks_project_budget:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ProjectBudget.class);
+    }
+
+}

module_kzks/src/main/java/org/jeecg/modules/projectBudget/entity/ProjectBudget.java

@@ -0,0 +1,154 @@
+package org.jeecg.modules.projectBudget.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.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 项目预算
+ * @Author: jeecg-boot
+ * @Date:   2023-08-10
+ * @Version: V1.0
+ */
+@Data
+@TableName("kzks_project_budget")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="kzks_project_budget对象", description="项目预算")
+public class ProjectBudget implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    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;
+	/**序号*/
+	@Excel(name = "序号", width = 15)
+    @ApiModelProperty(value = "序号")
+    private java.lang.String xuhao;
+	/**任务号*/
+	@Excel(name = "任务号", width = 15)
+    @ApiModelProperty(value = "任务号")
+    private java.lang.String taskNumber;
+	/**任务名称*/
+	@Excel(name = "任务名称", width = 15)
+    @ApiModelProperty(value = "任务名称")
+    private java.lang.String taskName;
+	/**型号*/
+	@Excel(name = "型号", width = 15)
+    @ApiModelProperty(value = "型号")
+    private java.lang.String model;
+	/**材料费（物资处采购项目）(万)*/
+	@Excel(name = "材料费（物资处采购项目）(万)", width = 15)
+    @ApiModelProperty(value = "材料费（物资处采购项目）(万)")
+    private java.lang.String cailiaofei;
+	/**可靠性设计(万)*/
+	@Excel(name = "可靠性设计(万)", width = 15)
+    @ApiModelProperty(value = "可靠性设计(万)")
+    private java.lang.String kkxSheji;
+	/**结构加工(万)*/
+	@Excel(name = "结构加工(万)", width = 15)
+    @ApiModelProperty(value = "结构加工(万)")
+    private java.lang.String jgJiagong;
+	/**表面处理(万)*/
+	@Excel(name = "表面处理(万)", width = 15)
+    @ApiModelProperty(value = "表面处理(万)")
+    private java.lang.String bmChuli;
+	/**环境试验(万)*/
+	@Excel(name = "环境试验(万)", width = 15)
+    @ApiModelProperty(value = "环境试验(万)")
+    private java.lang.String hjShiyan;
+	/**电缆加工(万)*/
+	@Excel(name = "电缆加工(万)", width = 15)
+    @ApiModelProperty(value = "电缆加工(万)")
+    private java.lang.String dlJiagong;
+	/**印制板设计及加工(万)*/
+	@Excel(name = "印制板设计及加工(万)", width = 15)
+    @ApiModelProperty(value = "印制板设计及加工(万)")
+    private java.lang.String yzbSheji;
+	/**试验工装(万)*/
+	@Excel(name = "试验工装(万)", width = 15)
+    @ApiModelProperty(value = "试验工装(万)")
+    private java.lang.String syGongzhuang;
+	/**测试工装(万)*/
+	@Excel(name = "测试工装(万)", width = 15)
+    @ApiModelProperty(value = "测试工装(万)")
+    private java.lang.String csGongzhuang;
+	/**包装箱(万)*/
+	@Excel(name = "包装箱(万)", width = 15)
+    @ApiModelProperty(value = "包装箱(万)")
+    private java.lang.String baozhuangxiang;
+	/**软件设计(万)*/
+	@Excel(name = "软件设计(万)", width = 15)
+    @ApiModelProperty(value = "软件设计(万)")
+    private java.lang.String rjSheji;
+	/**其他项目(万)*/
+	@Excel(name = "其他项目(万)", width = 15)
+    @ApiModelProperty(value = "其他项目(万)")
+    private java.lang.String qtXiangmu;
+	/**业务板块*/
+	@Excel(name = "业务板块", width = 15)
+    @ApiModelProperty(value = "业务板块")
+    private java.lang.String ywBankuai;
+	/**研制数量*/
+	@Excel(name = "研制数量", width = 15)
+    @ApiModelProperty(value = "研制数量")
+    private java.lang.String yzNumber;
+	/**研制阶段*/
+	@Excel(name = "研制阶段", width = 15)
+    @ApiModelProperty(value = "研制阶段")
+    private java.lang.String yzJieduan;
+	/**任务来源*/
+	@Excel(name = "任务来源", width = 15)
+    @ApiModelProperty(value = "任务来源")
+    private java.lang.String rwLaiyuan;
+	/**责任部门*/
+	@Excel(name = "责任部门", width = 15)
+    @ApiModelProperty(value = "责任部门")
+    private java.lang.String zrDepartment;
+	/**计划开始时间*/
+	@Excel(name = "计划开始时间", width = 20, format = "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 jhLaishi;
+	/**计划完成时间*/
+	@Excel(name = "计划完成时间", width = 20, format = "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 jhWancheng;
+}

module_kzks/src/main/java/org/jeecg/modules/projectBudget/mapper/ProjectBudgetMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.projectBudget.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.projectBudget.entity.ProjectBudget;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 项目预算
+ * @Author: jeecg-boot
+ * @Date:   2023-08-10
+ * @Version: V1.0
+ */
+public interface ProjectBudgetMapper extends BaseMapper<ProjectBudget> {
+
+}

module_kzks/src/main/java/org/jeecg/modules/projectBudget/mapper/xml/ProjectBudgetMapper.xml

@@ -0,0 +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.projectBudget.mapper.ProjectBudgetMapper">
+
+</mapper>

module_kzks/src/main/java/org/jeecg/modules/projectBudget/service/IProjectBudgetService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.projectBudget.service;
+
+import org.jeecg.modules.projectBudget.entity.ProjectBudget;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 项目预算
+ * @Author: jeecg-boot
+ * @Date:   2023-08-10
+ * @Version: V1.0
+ */
+public interface IProjectBudgetService extends IService<ProjectBudget> {
+
+}

module_kzks/src/main/java/org/jeecg/modules/projectBudget/service/impl/ProjectBudgetServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.projectBudget.service.impl;
+
+import org.jeecg.modules.projectBudget.entity.ProjectBudget;
+import org.jeecg.modules.projectBudget.mapper.ProjectBudgetMapper;
+import org.jeecg.modules.projectBudget.service.IProjectBudgetService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 项目预算
+ * @Author: jeecg-boot
+ * @Date:   2023-08-10
+ * @Version: V1.0
+ */
+@Service
+public class ProjectBudgetServiceImpl extends ServiceImpl<ProjectBudgetMapper, ProjectBudget> implements IProjectBudgetService {
+
+}

module_kzks/src/main/java/org/jeecg/modules/projectChbSwf/controller/ProjectChbSwfController.java

@@ -0,0 +1,177 @@
+package org.jeecg.modules.projectChbSwf.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.projectChbSwf.entity.ProjectChbSwf;
+import org.jeecg.modules.projectChbSwf.service.IProjectChbSwfService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.system.base.controller.JeecgController;
+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;
+
+ /**
+ * @Description: 事务费
+ * @Author: jeecg-boot
+ * @Date:   2023-08-10
+ * @Version: V1.0
+ */
+@Api(tags="事务费")
+@RestController
+@RequestMapping("/projectChbSwf/projectChbSwf")
+@Slf4j
+public class ProjectChbSwfController extends JeecgController<ProjectChbSwf, IProjectChbSwfService> {
+	@Autowired
+	private IProjectChbSwfService projectChbSwfService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param projectChbSwf
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "事务费-分页列表查询")
+	@ApiOperation(value="事务费-分页列表查询", notes="事务费-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<ProjectChbSwf>> queryPageList(ProjectChbSwf projectChbSwf,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ProjectChbSwf> queryWrapper = QueryGenerator.initQueryWrapper(projectChbSwf, req.getParameterMap());
+		Page<ProjectChbSwf> page = new Page<ProjectChbSwf>(pageNo, pageSize);
+		IPage<ProjectChbSwf> pageList = projectChbSwfService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param projectChbSwf
+	 * @return
+	 */
+	@AutoLog(value = "事务费-添加")
+	@ApiOperation(value="事务费-添加", notes="事务费-添加")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_chb_swf:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody ProjectChbSwf projectChbSwf) {
+		projectChbSwfService.save(projectChbSwf);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param projectChbSwf
+	 * @return
+	 */
+	@AutoLog(value = "事务费-编辑")
+	@ApiOperation(value="事务费-编辑", notes="事务费-编辑")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_chb_swf:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody ProjectChbSwf projectChbSwf) {
+		projectChbSwfService.updateById(projectChbSwf);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "事务费-通过id删除")
+	@ApiOperation(value="事务费-通过id删除", notes="事务费-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_chb_swf:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		projectChbSwfService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "事务费-批量删除")
+	@ApiOperation(value="事务费-批量删除", notes="事务费-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_chb_swf:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.projectChbSwfService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "事务费-通过id查询")
+	@ApiOperation(value="事务费-通过id查询", notes="事务费-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<ProjectChbSwf> queryById(@RequestParam(name="id",required=true) String id) {
+		ProjectChbSwf projectChbSwf = projectChbSwfService.getById(id);
+		if(projectChbSwf==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(projectChbSwf);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param projectChbSwf
+    */
+    //@RequiresPermissions("org.jeecg.modules:kzks_project_chb_swf:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ProjectChbSwf projectChbSwf) {
+        return super.exportXls(request, projectChbSwf, ProjectChbSwf.class, "事务费");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("kzks_project_chb_swf:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ProjectChbSwf.class);
+    }
+
+}

module_kzks/src/main/java/org/jeecg/modules/projectChbSwf/entity/ProjectChbSwf.java

@@ -0,0 +1,130 @@
+package org.jeecg.modules.projectChbSwf.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.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 事务费
+ * @Author: jeecg-boot
+ * @Date:   2023-08-10
+ * @Version: V1.0
+ */
+@Data
+@TableName("kzks_project_chb_swf")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="kzks_project_chb_swf对象", description="事务费")
+public class ProjectChbSwf implements Serializable {
+    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")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**年度*/
+	@Excel(name = "年度", width = 15)
+    @ApiModelProperty(value = "年度")
+    private java.lang.String nd;
+	/**凭证日期*/
+	@Excel(name = "凭证日期", width = 15)
+    @ApiModelProperty(value = "凭证日期")
+    private java.lang.String pzrq;
+	/**凭证号*/
+	@Excel(name = "凭证号", width = 15)
+    @ApiModelProperty(value = "凭证号")
+    private java.lang.String pzh;
+	/**摘要*/
+	@Excel(name = "摘要", width = 15)
+    @ApiModelProperty(value = "摘要")
+    private java.lang.String zy;
+	/**科目编号*/
+	@Excel(name = "科目编号", width = 15)
+    @ApiModelProperty(value = "科目编号")
+    private java.lang.String kmbh;
+	/**科目名称*/
+	@Excel(name = "科目名称", width = 15)
+    @ApiModelProperty(value = "科目名称")
+    private java.lang.String km;
+	/**方向*/
+	@Excel(name = "方向", width = 15)
+    @ApiModelProperty(value = "方向")
+    private java.lang.String fx;
+	/**金额*/
+	@Excel(name = "金额", width = 15)
+    @ApiModelProperty(value = "金额")
+    private java.lang.String je;
+	/**部门*/
+	@Excel(name = "部门", width = 15)
+    @ApiModelProperty(value = "部门")
+    private java.lang.String bm;
+	/**往来单位*/
+	@Excel(name = "往来单位", width = 15)
+    @ApiModelProperty(value = "往来单位")
+    private java.lang.String wldw;
+	/**辅助金额*/
+	@Excel(name = "辅助金额", width = 15)
+    @ApiModelProperty(value = "辅助金额")
+    private java.lang.String fzje;
+	/**制单人*/
+	@Excel(name = "制单人", width = 15)
+    @ApiModelProperty(value = "制单人")
+    private java.lang.String zdr;
+	/**会计期间*/
+	@Excel(name = "会计期间", width = 15)
+    @ApiModelProperty(value = "会计期间")
+    private java.lang.String kjqj;
+	/**凭证内码*/
+	@Excel(name = "凭证内码", width = 15)
+    @ApiModelProperty(value = "凭证内码")
+    private java.lang.String pznm;
+	/**项目编号*/
+	@Excel(name = "项目编号", width = 15)
+    @ApiModelProperty(value = "项目编号")
+    private java.lang.String xmbh;
+	/**项目名称*/
+	@Excel(name = "项目名称", width = 15)
+    @ApiModelProperty(value = "项目名称")
+    private java.lang.String xmmc;
+	/**项目类别*/
+	@Excel(name = "项目类别", width = 15)
+    @ApiModelProperty(value = "项目类别")
+    private java.lang.String xmlb;
+	/**任务号*/
+	@Excel(name = "任务号", width = 15)
+    @ApiModelProperty(value = "任务号")
+    private java.lang.String taskno;
+}

module_kzks/src/main/java/org/jeecg/modules/projectChbSwf/mapper/ProjectChbSwfMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.projectChbSwf.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.projectChbSwf.entity.ProjectChbSwf;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 事务费
+ * @Author: jeecg-boot
+ * @Date:   2023-08-10
+ * @Version: V1.0
+ */
+public interface ProjectChbSwfMapper extends BaseMapper<ProjectChbSwf> {
+
+}

module_kzks/src/main/java/org/jeecg/modules/projectChbSwf/mapper/xml/ProjectChbSwfMapper.xml

@@ -0,0 +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.projectChbSwf.mapper.ProjectChbSwfMapper">
+
+</mapper>

module_kzks/src/main/java/org/jeecg/modules/projectChbSwf/service/IProjectChbSwfService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.projectChbSwf.service;
+
+import org.jeecg.modules.projectChbSwf.entity.ProjectChbSwf;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 事务费
+ * @Author: jeecg-boot
+ * @Date:   2023-08-10
+ * @Version: V1.0
+ */
+public interface IProjectChbSwfService extends IService<ProjectChbSwf> {
+
+}

module_kzks/src/main/java/org/jeecg/modules/projectChbSwf/service/impl/ProjectChbSwfServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.projectChbSwf.service.impl;
+
+import org.jeecg.modules.projectChbSwf.entity.ProjectChbSwf;
+import org.jeecg.modules.projectChbSwf.mapper.ProjectChbSwfMapper;
+import org.jeecg.modules.projectChbSwf.service.IProjectChbSwfService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 事务费
+ * @Author: jeecg-boot
+ * @Date:   2023-08-10
+ * @Version: V1.0
+ */
+@Service
+public class ProjectChbSwfServiceImpl extends ServiceImpl<ProjectChbSwfMapper, ProjectChbSwf> implements IProjectChbSwfService {
+
+}

module_kzks/src/main/java/org/jeecg/modules/projectChbWxf/controller/ProjectChbWxfController.java

@@ -0,0 +1,177 @@
+package org.jeecg.modules.projectChbWxf.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.projectChbWxf.entity.ProjectChbWxf;
+import org.jeecg.modules.projectChbWxf.service.IProjectChbWxfService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.system.base.controller.JeecgController;
+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;
+
+ /**
+ * @Description: 外协费
+ * @Author: jeecg-boot
+ * @Date:   2023-08-10
+ * @Version: V1.0
+ */
+@Api(tags="外协费")
+@RestController
+@RequestMapping("/projectChbWxf/projectChbWxf")
+@Slf4j
+public class ProjectChbWxfController extends JeecgController<ProjectChbWxf, IProjectChbWxfService> {
+	@Autowired
+	private IProjectChbWxfService projectChbWxfService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param projectChbWxf
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "外协费-分页列表查询")
+	@ApiOperation(value="外协费-分页列表查询", notes="外协费-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<ProjectChbWxf>> queryPageList(ProjectChbWxf projectChbWxf,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ProjectChbWxf> queryWrapper = QueryGenerator.initQueryWrapper(projectChbWxf, req.getParameterMap());
+		Page<ProjectChbWxf> page = new Page<ProjectChbWxf>(pageNo, pageSize);
+		IPage<ProjectChbWxf> pageList = projectChbWxfService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param projectChbWxf
+	 * @return
+	 */
+	@AutoLog(value = "外协费-添加")
+	@ApiOperation(value="外协费-添加", notes="外协费-添加")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_chb_wxf:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody ProjectChbWxf projectChbWxf) {
+		projectChbWxfService.save(projectChbWxf);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param projectChbWxf
+	 * @return
+	 */
+	@AutoLog(value = "外协费-编辑")
+	@ApiOperation(value="外协费-编辑", notes="外协费-编辑")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_chb_wxf:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody ProjectChbWxf projectChbWxf) {
+		projectChbWxfService.updateById(projectChbWxf);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "外协费-通过id删除")
+	@ApiOperation(value="外协费-通过id删除", notes="外协费-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_chb_wxf:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		projectChbWxfService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "外协费-批量删除")
+	@ApiOperation(value="外协费-批量删除", notes="外协费-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_chb_wxf:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.projectChbWxfService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "外协费-通过id查询")
+	@ApiOperation(value="外协费-通过id查询", notes="外协费-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<ProjectChbWxf> queryById(@RequestParam(name="id",required=true) String id) {
+		ProjectChbWxf projectChbWxf = projectChbWxfService.getById(id);
+		if(projectChbWxf==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(projectChbWxf);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param projectChbWxf
+    */
+    //@RequiresPermissions("org.jeecg.modules:kzks_project_chb_wxf:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ProjectChbWxf projectChbWxf) {
+        return super.exportXls(request, projectChbWxf, ProjectChbWxf.class, "外协费");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("kzks_project_chb_wxf:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ProjectChbWxf.class);
+    }
+
+}

module_kzks/src/main/java/org/jeecg/modules/projectChbWxf/entity/ProjectChbWxf.java

@@ -0,0 +1,130 @@
+package org.jeecg.modules.projectChbWxf.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.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 外协费
+ * @Author: jeecg-boot
+ * @Date:   2023-08-10
+ * @Version: V1.0
+ */
+@Data
+@TableName("kzks_project_chb_wxf")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="kzks_project_chb_wxf对象", description="外协费")
+public class ProjectChbWxf implements Serializable {
+    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")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**年度*/
+	@Excel(name = "年度", width = 15)
+    @ApiModelProperty(value = "年度")
+    private java.lang.String nd;
+	/**凭证日期*/
+	@Excel(name = "凭证日期", width = 15)
+    @ApiModelProperty(value = "凭证日期")
+    private java.lang.String pzrq;
+	/**凭证号*/
+	@Excel(name = "凭证号", width = 15)
+    @ApiModelProperty(value = "凭证号")
+    private java.lang.String pzh;
+	/**摘要*/
+	@Excel(name = "摘要", width = 15)
+    @ApiModelProperty(value = "摘要")
+    private java.lang.String zy;
+	/**科目编号*/
+	@Excel(name = "科目编号", width = 15)
+    @ApiModelProperty(value = "科目编号")
+    private java.lang.String kmbh;
+	/**科目名称*/
+	@Excel(name = "科目名称", width = 15)
+    @ApiModelProperty(value = "科目名称")
+    private java.lang.String km;
+	/**方向*/
+	@Excel(name = "方向", width = 15)
+    @ApiModelProperty(value = "方向")
+    private java.lang.String fx;
+	/**金额*/
+	@Excel(name = "金额", width = 15)
+    @ApiModelProperty(value = "金额")
+    private java.lang.String je;
+	/**部门*/
+	@Excel(name = "部门", width = 15)
+    @ApiModelProperty(value = "部门")
+    private java.lang.String bm;
+	/**往来单位*/
+	@Excel(name = "往来单位", width = 15)
+    @ApiModelProperty(value = "往来单位")
+    private java.lang.String wldw;
+	/**辅助金额*/
+	@Excel(name = "辅助金额", width = 15)
+    @ApiModelProperty(value = "辅助金额")
+    private java.lang.String fzje;
+	/**制单人*/
+	@Excel(name = "制单人", width = 15)
+    @ApiModelProperty(value = "制单人")
+    private java.lang.String zdr;
+	/**会计期间*/
+	@Excel(name = "会计期间", width = 15)
+    @ApiModelProperty(value = "会计期间")
+    private java.lang.String kjqj;
+	/**凭证内码*/
+	@Excel(name = "凭证内码", width = 15)
+    @ApiModelProperty(value = "凭证内码")
+    private java.lang.String pznm;
+	/**项目编号*/
+	@Excel(name = "项目编号", width = 15)
+    @ApiModelProperty(value = "项目编号")
+    private java.lang.String xmbh;
+	/**项目名称*/
+	@Excel(name = "项目名称", width = 15)
+    @ApiModelProperty(value = "项目名称")
+    private java.lang.String xmmc;
+	/**项目类别*/
+	@Excel(name = "项目类别", width = 15)
+    @ApiModelProperty(value = "项目类别")
+    private java.lang.String xmlb;
+	/**任务号*/
+	@Excel(name = "任务号", width = 15)
+    @ApiModelProperty(value = "任务号")
+    private java.lang.String taskno;
+}

module_kzks/src/main/java/org/jeecg/modules/projectChbWxf/mapper/ProjectChbWxfMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.projectChbWxf.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.projectChbWxf.entity.ProjectChbWxf;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 外协费
+ * @Author: jeecg-boot
+ * @Date:   2023-08-10
+ * @Version: V1.0
+ */
+public interface ProjectChbWxfMapper extends BaseMapper<ProjectChbWxf> {
+
+}

module_kzks/src/main/java/org/jeecg/modules/projectChbWxf/mapper/xml/ProjectChbWxfMapper.xml

@@ -0,0 +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.projectChbWxf.mapper.ProjectChbWxfMapper">
+
+</mapper>

module_kzks/src/main/java/org/jeecg/modules/projectChbWxf/service/IProjectChbWxfService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.projectChbWxf.service;
+
+import org.jeecg.modules.projectChbWxf.entity.ProjectChbWxf;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 外协费
+ * @Author: jeecg-boot
+ * @Date:   2023-08-10
+ * @Version: V1.0
+ */
+public interface IProjectChbWxfService extends IService<ProjectChbWxf> {
+
+}

module_kzks/src/main/java/org/jeecg/modules/projectChbWxf/service/impl/ProjectChbWxfServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.projectChbWxf.service.impl;
+
+import org.jeecg.modules.projectChbWxf.entity.ProjectChbWxf;
+import org.jeecg.modules.projectChbWxf.mapper.ProjectChbWxfMapper;
+import org.jeecg.modules.projectChbWxf.service.IProjectChbWxfService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 外协费
+ * @Author: jeecg-boot
+ * @Date:   2023-08-10
+ * @Version: V1.0
+ */
+@Service
+public class ProjectChbWxfServiceImpl extends ServiceImpl<ProjectChbWxfMapper, ProjectChbWxf> implements IProjectChbWxfService {
+
+}

module_kzks/src/main/java/org/jeecg/modules/projectChbZyf/controller/ProjectChbZyfController.java

@@ -0,0 +1,177 @@
+package org.jeecg.modules.projectChbZyf.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.projectChbZyf.entity.ProjectChbZyf;
+import org.jeecg.modules.projectChbZyf.service.IProjectChbZyfService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.system.base.controller.JeecgController;
+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;
+
+ /**
+ * @Description: 专用费
+ * @Author: jeecg-boot
+ * @Date:   2023-08-10
+ * @Version: V1.0
+ */
+@Api(tags="专用费")
+@RestController
+@RequestMapping("/projectChbZyf/projectChbZyf")
+@Slf4j
+public class ProjectChbZyfController extends JeecgController<ProjectChbZyf, IProjectChbZyfService> {
+	@Autowired
+	private IProjectChbZyfService projectChbZyfService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param projectChbZyf
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "专用费-分页列表查询")
+	@ApiOperation(value="专用费-分页列表查询", notes="专用费-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<ProjectChbZyf>> queryPageList(ProjectChbZyf projectChbZyf,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ProjectChbZyf> queryWrapper = QueryGenerator.initQueryWrapper(projectChbZyf, req.getParameterMap());
+		Page<ProjectChbZyf> page = new Page<ProjectChbZyf>(pageNo, pageSize);
+		IPage<ProjectChbZyf> pageList = projectChbZyfService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param projectChbZyf
+	 * @return
+	 */
+	@AutoLog(value = "专用费-添加")
+	@ApiOperation(value="专用费-添加", notes="专用费-添加")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_chb_zyf:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody ProjectChbZyf projectChbZyf) {
+		projectChbZyfService.save(projectChbZyf);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param projectChbZyf
+	 * @return
+	 */
+	@AutoLog(value = "专用费-编辑")
+	@ApiOperation(value="专用费-编辑", notes="专用费-编辑")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_chb_zyf:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody ProjectChbZyf projectChbZyf) {
+		projectChbZyfService.updateById(projectChbZyf);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "专用费-通过id删除")
+	@ApiOperation(value="专用费-通过id删除", notes="专用费-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_chb_zyf:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		projectChbZyfService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "专用费-批量删除")
+	@ApiOperation(value="专用费-批量删除", notes="专用费-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_chb_zyf:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.projectChbZyfService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "专用费-通过id查询")
+	@ApiOperation(value="专用费-通过id查询", notes="专用费-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<ProjectChbZyf> queryById(@RequestParam(name="id",required=true) String id) {
+		ProjectChbZyf projectChbZyf = projectChbZyfService.getById(id);
+		if(projectChbZyf==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(projectChbZyf);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param projectChbZyf
+    */
+    //@RequiresPermissions("org.jeecg.modules:kzks_project_chb_zyf:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ProjectChbZyf projectChbZyf) {
+        return super.exportXls(request, projectChbZyf, ProjectChbZyf.class, "专用费");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("kzks_project_chb_zyf:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ProjectChbZyf.class);
+    }
+
+}

module_kzks/src/main/java/org/jeecg/modules/projectChbZyf/entity/ProjectChbZyf.java

@@ -0,0 +1,130 @@
+package org.jeecg.modules.projectChbZyf.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.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 专用费
+ * @Author: jeecg-boot
+ * @Date:   2023-08-10
+ * @Version: V1.0
+ */
+@Data
+@TableName("kzks_project_chb_zyf")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="kzks_project_chb_zyf对象", description="专用费")
+public class ProjectChbZyf implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    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;
+	/**年度*/
+	@Excel(name = "年度", width = 15)
+    @ApiModelProperty(value = "年度")
+    private java.lang.String nd;
+	/**凭证日期*/
+	@Excel(name = "凭证日期", width = 15)
+    @ApiModelProperty(value = "凭证日期")
+    private java.lang.String pzrq;
+	/**凭证号*/
+	@Excel(name = "凭证号", width = 15)
+    @ApiModelProperty(value = "凭证号")
+    private java.lang.String pzh;
+	/**摘要*/
+	@Excel(name = "摘要", width = 15)
+    @ApiModelProperty(value = "摘要")
+    private java.lang.String zy;
+	/**科目编号*/
+	@Excel(name = "科目编号", width = 15)
+    @ApiModelProperty(value = "科目编号")
+    private java.lang.String kmbh;
+	/**科目名称*/
+	@Excel(name = "科目名称", width = 15)
+    @ApiModelProperty(value = "科目名称")
+    private java.lang.String km;
+	/**方向*/
+	@Excel(name = "方向", width = 15)
+    @ApiModelProperty(value = "方向")
+    private java.lang.String fx;
+	/**金额*/
+	@Excel(name = "金额", width = 15)
+    @ApiModelProperty(value = "金额")
+    private java.lang.String je;
+	/**部门*/
+	@Excel(name = "部门", width = 15)
+    @ApiModelProperty(value = "部门")
+    private java.lang.String bm;
+	/**往来单位*/
+	@Excel(name = "往来单位", width = 15)
+    @ApiModelProperty(value = "往来单位")
+    private java.lang.String wldw;
+	/**辅助金额*/
+	@Excel(name = "辅助金额", width = 15)
+    @ApiModelProperty(value = "辅助金额")
+    private java.lang.String fzje;
+	/**制单人*/
+	@Excel(name = "制单人", width = 15)
+    @ApiModelProperty(value = "制单人")
+    private java.lang.String zdr;
+	/**会计期间*/
+	@Excel(name = "会计期间", width = 15)
+    @ApiModelProperty(value = "会计期间")
+    private java.lang.String kjqj;
+	/**凭证内码*/
+	@Excel(name = "凭证内码", width = 15)
+    @ApiModelProperty(value = "凭证内码")
+    private java.lang.String pznm;
+	/**项目编号*/
+	@Excel(name = "项目编号", width = 15)
+    @ApiModelProperty(value = "项目编号")
+    private java.lang.String xmbh;
+	/**项目名称*/
+	@Excel(name = "项目名称", width = 15)
+    @ApiModelProperty(value = "项目名称")
+    private java.lang.String xmmc;
+	/**项目类别*/
+	@Excel(name = "项目类别", width = 15)
+    @ApiModelProperty(value = "项目类别")
+    private java.lang.String xmlb;
+	/**任务号*/
+	@Excel(name = "任务号", width = 15)
+    @ApiModelProperty(value = "任务号")
+    private java.lang.String taskno;
+}

module_kzks/src/main/java/org/jeecg/modules/projectChbZyf/mapper/ProjectChbZyfMapper.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.projectChbZyf.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyf;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 专用费
+ * @Author: jeecg-boot
+ * @Date:   2023-08-10
+ * @Version: V1.0
+ */
+public interface ProjectChbZyfMapper extends BaseMapper<ProjectChbZyf> {
+
+    public void truncateTableByYear();
+
+}

module_kzks/src/main/java/org/jeecg/modules/projectChbZyf/mapper/xml/ProjectChbZyfMapper.xml

@@ -0,0 +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.projectChbZyf.mapper.ProjectChbZyfMapper">
+
+</mapper>

module_kzks/src/main/java/org/jeecg/modules/projectChbZyf/service/IProjectChbZyfService.java

@@ -0,0 +1,24 @@
+package org.jeecg.modules.projectChbZyf.service;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyf;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @Description: 专用费
+ * @Author: jeecg-boot
+ * @Date:   2023-08-10
+ * @Version: V1.0
+ */
+public interface IProjectChbZyfService extends IService<ProjectChbZyf> {
+
+//    public Result<?> importExcel1(HttpServletRequest request, HttpServletResponse response, Class<ProjectChbZyf> clazz);
+
+    public void truncateTableByYear();
+
+    public Result<?> importExcel1(String strUrl, Class<ProjectChbZyf> clazz);
+}

module_kzks/src/main/java/org/jeecg/modules/projectChbZyf/service/impl/ProjectChbZyfServiceImpl.java

@@ -0,0 +1,131 @@
+package org.jeecg.modules.projectChbZyf.service.impl;
+
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyf;
+import org.jeecg.modules.projectChbZyf.mapper.ProjectChbZyfMapper;
+import org.jeecg.modules.projectChbZyf.service.IProjectChbZyfService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.util.StreamUtils;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 专用费
+ * @Author: jeecg-boot
+ * @Date:   2023-08-10
+ * @Version: V1.0
+ */
+@Service
+@Slf4j
+public class ProjectChbZyfServiceImpl extends ServiceImpl<ProjectChbZyfMapper, ProjectChbZyf> implements IProjectChbZyfService {
+
+    @Autowired
+    @SuppressWarnings("all")
+    public ProjectChbZyfMapper zyfMapper;
+
+    /**
+     * 通过excel导入数据
+     * @return
+     */
+    public Result<?> importExcel1(String strUrl, Class<ProjectChbZyf> clazz) {
+
+        InputStream inputStream = null;
+        try {
+            inputStream = new FileInputStream(strUrl);
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        // 获取上传文件对象
+        ImportParams params = new ImportParams();
+        params.setTitleRows(0);
+        params.setHeadRows(1);
+        params.setNeedSave(true);
+        try {
+            List<ProjectChbZyf> 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();
+            }
+        }
+    }
+
+//    public Result<?> importExcel1(HttpServletRequest request, HttpServletResponse response, Class<ProjectChbZyf> clazz) {
+//        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+//        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+//        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+//            // 获取上传文件对象
+//            MultipartFile file = entity.getValue();
+//            ImportParams params = new ImportParams();
+//            params.setTitleRows(0);
+//            params.setHeadRows(1);
+//            params.setNeedSave(true);
+//            try {
+//                List<ProjectChbZyf> list = ExcelImportUtil.importExcel(file.getInputStream(), 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 {
+//                    file.getInputStream().close();
+//                } catch (IOException e) {
+//                    e.printStackTrace();
+//                }
+//            }
+//        }
+//        return Result.error("文件导入失败！");
+//    }
+
+    public void truncateTableByYear(){
+        zyfMapper.truncateTableByYear();
+    }
+}

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

@@ -1,42 +1,36 @@
 package org.jeecg.modules.projectImportList.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.projectImportList.entity.ProjectImportList;
-import org.jeecg.modules.projectImportList.service.IProjectImportListService;
-
 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.config.JeecgBaseConfig;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyf;
+import org.jeecg.modules.projectChbZyf.service.IProjectChbZyfService;
+import org.jeecg.modules.projectImportList.entity.ProjectImportList;
+import org.jeecg.modules.projectImportList.service.IProjectImportListService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StreamUtils;
 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.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.Arrays;
+
+/**
  * @Description: 导入并下载
  * @Author: jeecg-boot
  * @Date:   2023-08-10
@@ -49,7 +43,93 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class ProjectImportListController extends JeecgController<ProjectImportList, IProjectImportListService> {
 	@Autowired
 	private IProjectImportListService projectImportListService;
-	
+	@Autowired
+	@SuppressWarnings("all")
+	private IProjectChbZyfService zyfService;
+	@Autowired
+	@SuppressWarnings("all")
+	private JeecgBaseConfig jeecgBaseConfig;
+
+	 /**
+	  * 通过excel导入数据
+	  *
+	  * @param request
+	  * @param response
+	  * @return
+	  */
+	 //@RequiresPermissions("kzks_project_import_list:importExcel")
+	 @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+	 public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+		 return super.importExcel(request, response, ProjectImportList.class);
+	 }
+
+//	 public InputStream getFileStream(String strUrl) {
+//		 InputStream inputStream = null;
+//		 try {
+//			 URL httpUrl = new URL(strUrl);
+//			 HttpURLConnection httpURLConnection = (HttpURLConnection) httpUrl.openConnection();
+//			 httpURLConnection.setConnectTimeout(1000 * 3);
+//			 httpURLConnection.setReadTimeout(1000 * 20);
+//			 httpURLConnection.connect();
+//			 inputStream = httpURLConnection.getInputStream();
+//			 byte[] in = StreamUtils.copyToByteArray(inputStream);
+//			 return new ByteArrayInputStream(in);
+//		 } catch (Exception e) {
+//			 log.error(e.getMessage(), e);
+////			 throw new ApplicationException(10086, "获取文件内容失败，请重新上传");
+//		 } finally {
+//			 if (inputStream != null) {
+//				 try {
+//					 inputStream.close();
+//				 } catch (IOException e) {
+//					 log.error("inputStream.close", e);
+//				 }
+//			 }
+//		 }
+//	 }
+
+	 /**
+	  * 通过excel导入其他表的数据
+	  *项目预算 1
+	  *外协费 2
+	  *事务费 3
+	  *专用费 4
+	  * @param request
+	  * @param response
+	  * @return
+	  */
+	 @ApiOperation(value="导入并解析数据——专用费4", notes="导入并解析数据——专用费4")
+	 @RequestMapping(value = "/importOtherExcel", method = RequestMethod.POST)
+//	 @RequestMapping(value = "/importExcel", method = RequestMethod.POST)//
+	 public Result<?> importOtherExcel(@RequestBody ProjectImportList projectImportList,HttpServletRequest request, HttpServletResponse response) {
+
+		 Result<?> result = new Result<>();
+		 result.setCode(500);
+		 result.setMessage("请选择正确的导入类型！");
+
+		 System.out.println(projectImportList.getFileType());
+
+//		 String url =  "D:/opt/upFiles/" +
+
+		 String url = jeecgBaseConfig.getPath().getUpload() + "/"+  projectImportList.getFileAddress();
+
+//		 MultipartFile file = new
+		 return  zyfService.importExcel1(url, ProjectChbZyf.class);
+
+//		 if(projectImportList.getFileType().equals("1")){
+//			 return result;
+//		 }else if(projectImportList.getFileType().equals("2")){
+//			 return result;
+//		 }else if(projectImportList.getFileType().equals("3")){
+//			 return result;
+//		 }else if(projectImportList.getFileType().equals("4")){
+//			 return  zyfService.importExcel1(request, response, ProjectChbZyf.class);
+//		 }else {
+//			 return result;
+//		 }
+//		 return  zyfService.importExcel1(request, response, ProjectChbZyf.class);
+	 }
+
 	/**
 	 * 分页列表查询
 	 *
@@ -71,7 +151,7 @@ public class ProjectImportListController extends JeecgController<ProjectImportLi
 		IPage<ProjectImportList> pageList = projectImportListService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -86,7 +166,7 @@ public class ProjectImportListController extends JeecgController<ProjectImportLi
 		projectImportListService.save(projectImportList);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -101,7 +181,7 @@ public class ProjectImportListController extends JeecgController<ProjectImportLi
 		projectImportListService.updateById(projectImportList);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -116,7 +196,7 @@ public class ProjectImportListController extends JeecgController<ProjectImportLi
 		projectImportListService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -131,7 +211,7 @@ public class ProjectImportListController extends JeecgController<ProjectImportLi
 		this.projectImportListService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *
@@ -161,17 +241,6 @@ public class ProjectImportListController extends JeecgController<ProjectImportLi
         return super.exportXls(request, projectImportList, ProjectImportList.class, "导入并下载");
     }
 
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    //@RequiresPermissions("kzks_project_import_list:importExcel")
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, ProjectImportList.class);
-    }
+
 
 }