新增筛选费

module_kzks/src/main/java/org/jeecg/modules/costModelProductPrice/entity/KzksCostModelProductPrice.java

@@ -164,6 +164,11 @@ public class KzksCostModelProductPrice implements Serializable {
     @Excel(name = "外协费", width = 15)
     @ApiModelProperty(value = "外协费")
     private java.math.BigDecimal wxf;
+
+    /**筛选费*/
+    @Excel(name = "筛选费", width = 15)
+    @ApiModelProperty(value = "筛选费")
+    private java.math.BigDecimal sxf;
     /**
      * 燃料动力费/（材料费+外协费+事务费+专用费）×1.5%
      */
@@ -294,6 +299,11 @@ public class KzksCostModelProductPrice implements Serializable {
     @Excel(name = "主管设计师/来自科研任务", width = 15)
     @ApiModelProperty(value = "主管设计师/来自科研任务")
     private java.lang.String ywfzrname;
+
+    @Excel(name = "科研任务责任人/来自科研任务", width = 15)
+    @ApiModelProperty(value = "科研任务责任人/来自科研任务")
+    private java.lang.String xhzzrname;
+
     /**
      * 设计工时
      */

module_kzks/src/main/java/org/jeecg/modules/costModelProductPrice/mapper/xml/KzksCostModelProductPriceMapper.xml

@@ -6,62 +6,64 @@
     <!-- 批量添加任务 -->
     <insert id="insertBatchIntoKzksCostModelProductPrice">
         insert into kzks_cost_model_product_price
-            (
-             taskno,taskname,xhname,jhwcsj,yzjdname,processPercent,cost_percent,yzsl,
-             one_income,one_cost,one_profit,lre,lrl,EstimationCoat,contractfpe,TaskMoney,
-             zcb,clf,zyf,swf,wxf,rldlf,gdzczj,gzjlwf,glf,zjcb,lbsy,workhour,zrbm,jycsid,jycs,
-             hxzxid,hxzxname,tasktype,AuditPrice,iflag,Brief,reftaskno,pcCode,bcCode,blCode,
-        business_man_name,sjgs,scgs,status,ywfzrname
-             )
+        (
+        taskno,taskname,xhname,jhwcsj,yzjdname,processPercent,cost_percent,yzsl,
+        one_income,one_cost,one_profit,lre,lrl,EstimationCoat,contractfpe,TaskMoney,
+        zcb,clf,zyf,swf,wxf,rldlf,gdzczj,gzjlwf,glf,zjcb,lbsy,workhour,zrbm,jycsid,jycs,
+        hxzxid,hxzxname,tasktype,AuditPrice,iflag,Brief,reftaskno,pcCode,bcCode,blCode,
+        business_man_name,sjgs,scgs,status,ywfzrname,xhzzrname,sxf
+        )
         VALUES
         <foreach collection="productPriceList" item="productPrice" index="index" separator=",">
             (
-             #{productPrice.taskno},
-             #{productPrice.taskname},
-             #{productPrice.xhname},
-             #{productPrice.jhwcsj},
-             #{productPrice.yzjdname},
-             #{productPrice.processpercent},
-             #{productPrice.costPercent},
-             #{productPrice.yzsl},
-             #{productPrice.oneIncome},
-             #{productPrice.oneCost},
-             #{productPrice.oneProfit},
-             #{productPrice.lre},
-             #{productPrice.lrl},
-             #{productPrice.estimationcoat},
-             #{productPrice.contractfpe},
-             #{productPrice.taskmoney},
-             #{productPrice.zcb},
-             #{productPrice.clf},
-             #{productPrice.zyf},
-             #{productPrice.swf},
-             #{productPrice.wxf},
-             #{productPrice.rldlf},
-             #{productPrice.gdzczj},
-             #{productPrice.gzjlwf},
-             #{productPrice.glf},
-             #{productPrice.zjcb},
-             #{productPrice.lbsy},
-             #{productPrice.workhour},
-             #{productPrice.zrbm},
-             #{productPrice.jycsid},
-             #{productPrice.jycs},
-             #{productPrice.hxzxid},
-             #{productPrice.hxzxname},
-             #{productPrice.tasktype},
-             #{productPrice.auditprice},
-             #{productPrice.iflag},
-             #{productPrice.brief},
-             #{productPrice.reftaskno},
-             #{productPrice.pccode},
-             #{productPrice.bccode},
-             #{productPrice.blcode},
-             #{productPrice.businessManName},
-             #{productPrice.sjgs},
-             #{productPrice.scgs},
-             #{productPrice.status},
-             #{productPrice.ywfzrname}
+            #{productPrice.taskno},
+            #{productPrice.taskname},
+            #{productPrice.xhname},
+            #{productPrice.jhwcsj},
+            #{productPrice.yzjdname},
+            #{productPrice.processpercent},
+            #{productPrice.costPercent},
+            #{productPrice.yzsl},
+            #{productPrice.oneIncome},
+            #{productPrice.oneCost},
+            #{productPrice.oneProfit},
+            #{productPrice.lre},
+            #{productPrice.lrl},
+            #{productPrice.estimationcoat},
+            #{productPrice.contractfpe},
+            #{productPrice.taskmoney},
+            #{productPrice.zcb},
+            #{productPrice.clf},
+            #{productPrice.zyf},
+            #{productPrice.swf},
+            #{productPrice.wxf},
+            #{productPrice.rldlf},
+            #{productPrice.gdzczj},
+            #{productPrice.gzjlwf},
+            #{productPrice.glf},
+            #{productPrice.zjcb},
+            #{productPrice.lbsy},
+            #{productPrice.workhour},
+            #{productPrice.zrbm},
+            #{productPrice.jycsid},
+            #{productPrice.jycs},
+            #{productPrice.hxzxid},
+            #{productPrice.hxzxname},
+            #{productPrice.tasktype},
+            #{productPrice.auditprice},
+            #{productPrice.iflag},
+            #{productPrice.brief},
+            #{productPrice.reftaskno},
+            #{productPrice.pccode},
+            #{productPrice.bccode},
+            #{productPrice.blcode},
+            #{productPrice.businessManName},
+            #{productPrice.sjgs},
+            #{productPrice.scgs},
+            #{productPrice.status},
+            #{productPrice.ywfzrname},
+            #{productPrice.xhzzrname},
+            #{productPrice.sxf}
             )
         </foreach>
     </insert>

module_kzks/src/main/java/org/jeecg/modules/costModelProductPrice/service/impl/KzksCostModelProductPriceServiceImpl.java

@@ -99,6 +99,8 @@ public class KzksCostModelProductPriceServiceImpl extends ServiceImpl<KzksCostMo
             BigDecimal oneSwf = BigDecimal.valueOf(0);
             // 单台 -- 外协费
             BigDecimal oneWxf = BigDecimal.valueOf(0);
+            // 单台 -- 外协费
+            BigDecimal oneSxf = BigDecimal.valueOf(0);
             // 单台 -- 专用费
             BigDecimal oneZyf = BigDecimal.valueOf(0);
             // 单台 -- 燃料动力费
@@ -127,6 +129,7 @@ public class KzksCostModelProductPriceServiceImpl extends ServiceImpl<KzksCostMo
             projectCostHuiji.setZcb(Optional.ofNullable(projectCostHuiji.getZcb()).orElse(BigDecimal.ZERO));
             projectCostHuiji.setSwf(Optional.ofNullable(projectCostHuiji.getSwf()).orElse(BigDecimal.ZERO));
             projectCostHuiji.setWxf(Optional.ofNullable(projectCostHuiji.getWxf()).orElse(BigDecimal.ZERO));
+            projectCostHuiji.setSxf(Optional.ofNullable(projectCostHuiji.getSxf()).orElse(BigDecimal.ZERO));
             projectCostHuiji.setZyf(Optional.ofNullable(projectCostHuiji.getZyf()).orElse(BigDecimal.ZERO));
             projectCostHuiji.setRldlf(Optional.ofNullable(projectCostHuiji.getRldlf()).orElse(BigDecimal.ZERO));
             projectCostHuiji.setGdzczj(Optional.ofNullable(projectCostHuiji.getGdzczj()).orElse(BigDecimal.ZERO));
@@ -154,6 +157,8 @@ public class KzksCostModelProductPriceServiceImpl extends ServiceImpl<KzksCostMo
                 oneSwf = projectCostHuiji.getSwf().divide(yzsl, 5, BigDecimal.ROUND_HALF_UP);
                 // 单台 -- 外协费
                 oneWxf = projectCostHuiji.getWxf().divide(yzsl, 5, BigDecimal.ROUND_HALF_UP);
+                // 单台 -- 筛选费
+                oneSxf = projectCostHuiji.getSxf().divide(yzsl, 5, BigDecimal.ROUND_HALF_UP);
                 // 单台 -- 专用费
                 oneZyf = projectCostHuiji.getZyf().divide(yzsl, 5, BigDecimal.ROUND_HALF_UP);
                 // 单台 -- 燃料动力费
@@ -206,6 +211,7 @@ public class KzksCostModelProductPriceServiceImpl extends ServiceImpl<KzksCostMo
             productPrice.setZyf(oneZyf);
             productPrice.setSwf(oneSwf);
             productPrice.setWxf(oneWxf);
+            productPrice.setSxf(oneSxf);
             productPrice.setRldlf(oneRldlf);
             productPrice.setGdzczj(oneGdzczj);
             productPrice.setGzjlwf(oneGzjlwf);
@@ -229,6 +235,7 @@ public class KzksCostModelProductPriceServiceImpl extends ServiceImpl<KzksCostMo
             if (projectCostHuiji.getBusinessManName() != null)
                 productPrice.setBusinessManName(projectCostHuiji.getBusinessManName());
             if (projectCostHuiji.getYwfzrname() != null) productPrice.setYwfzrname(projectCostHuiji.getYwfzrname());
+            if (projectCostHuiji.getXhzzrname() != null) productPrice.setXhzzrname(projectCostHuiji.getXhzzrname());
             productPrice.setSjgs(oneSjgs);
             productPrice.setScgs(oneScgs);
             String status = Optional.ofNullable(projectCostHuiji.getHjstatus()).orElse("0");

module_kzks/src/main/java/org/jeecg/modules/projectChbSxf/controller/ProjectChbSxfController.java

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

module_kzks/src/main/java/org/jeecg/modules/projectChbSxf/entity/ProjectChbSxf.java

@@ -0,0 +1,130 @@
+package org.jeecg.modules.projectChbSxf.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: kzks_project_chb_sxf
+ * @Author: jeecg-boot
+ * @Date:   2024-01-19
+ * @Version: V1.0
+ */
+@Data
+@TableName("kzks_project_chb_sxf")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="kzks_project_chb_sxf对象", description="kzks_project_chb_sxf")
+public class ProjectChbSxf 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.math.BigDecimal 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.math.BigDecimal 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/projectChbSxf/mapper/ProjectChbSxfMapper.java

@@ -0,0 +1,26 @@
+package org.jeecg.modules.projectChbSxf.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.projectChbSxf.entity.ProjectChbSxf;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: kzks_project_chb_sxf
+ * @Author: jeecg-boot
+ * @Date:   2024-01-19
+ * @Version: V1.0
+ */
+@Mapper
+public interface ProjectChbSxfMapper extends BaseMapper<ProjectChbSxf> {
+
+    @Select("SELECT count(*) FROM kzks_project_chb_sxf WHERE nd = #{nd}")
+    int getIfHaveThisNd(String nd);
+
+    @Delete("DELETE FROM kzks_project_chb_sxf WHERE nd = #{nd}")
+    void deleteWxfByNd(String nd);
+}

module_kzks/src/main/java/org/jeecg/modules/projectChbSxf/mapper/xml/ProjectChbSxfMapper.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.projectChbSxf.mapper.ProjectChbSxfMapper">
+
+</mapper>

module_kzks/src/main/java/org/jeecg/modules/projectChbSxf/service/IProjectChbSxfService.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.projectChbSxf.service;
+
+import org.jeecg.modules.projectChbSxf.entity.ProjectChbSxf;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: kzks_project_chb_sxf
+ * @Author: jeecg-boot
+ * @Date:   2024-01-19
+ * @Version: V1.0
+ */
+public interface IProjectChbSxfService extends IService<ProjectChbSxf> {
+
+    int getIfHaveThisNd(String nd);
+
+    void deleteWxfByNd(String nd);
+}

module_kzks/src/main/java/org/jeecg/modules/projectChbSxf/service/impl/ProjectChbSxfServiceImpl.java

@@ -0,0 +1,32 @@
+package org.jeecg.modules.projectChbSxf.service.impl;
+
+import org.jeecg.modules.projectChbSxf.entity.ProjectChbSxf;
+import org.jeecg.modules.projectChbSxf.mapper.ProjectChbSxfMapper;
+import org.jeecg.modules.projectChbSxf.service.IProjectChbSxfService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: kzks_project_chb_sxf
+ * @Author: jeecg-boot
+ * @Date:   2024-01-19
+ * @Version: V1.0
+ */
+@Service
+public class ProjectChbSxfServiceImpl extends ServiceImpl<ProjectChbSxfMapper, ProjectChbSxf> implements IProjectChbSxfService {
+
+    @Autowired
+    private ProjectChbSxfMapper sxfMapper;
+
+    @Override
+    public int getIfHaveThisNd(String nd) {
+        return sxfMapper.getIfHaveThisNd(nd);
+    }
+
+    @Override
+    public void deleteWxfByNd(String nd) {
+        sxfMapper.deleteWxfByNd(nd);
+    }
+}

module_kzks/src/main/java/org/jeecg/modules/projectChbSxf/vue/ProjectChbSxfList.vue

@@ -0,0 +1,273 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('kzks_project_chb_sxf')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <project-chb-sxf-modal ref="modalForm" @ok="modalFormOk"></project-chb-sxf-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ProjectChbSxfModal from './modules/ProjectChbSxfModal'
+
+  export default {
+    name: 'ProjectChbSxfList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ProjectChbSxfModal
+    },
+    data () {
+      return {
+        description: 'kzks_project_chb_sxf管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'年度',
+            align:"center",
+            dataIndex: 'nd'
+          },
+          {
+            title:'凭证日期',
+            align:"center",
+            dataIndex: 'pzrq'
+          },
+          {
+            title:'凭证号',
+            align:"center",
+            dataIndex: 'pzh'
+          },
+          {
+            title:'摘要',
+            align:"center",
+            dataIndex: 'zy'
+          },
+          {
+            title:'科目编号',
+            align:"center",
+            dataIndex: 'kmbh'
+          },
+          {
+            title:'科目名称',
+            align:"center",
+            dataIndex: 'km'
+          },
+          {
+            title:'方向',
+            align:"center",
+            dataIndex: 'fx'
+          },
+          {
+            title:'金额',
+            align:"center",
+            dataIndex: 'je'
+          },
+          {
+            title:'部门',
+            align:"center",
+            dataIndex: 'bm'
+          },
+          {
+            title:'往来单位',
+            align:"center",
+            dataIndex: 'wldw'
+          },
+          {
+            title:'辅助金额',
+            align:"center",
+            dataIndex: 'fzje'
+          },
+          {
+            title:'制单人',
+            align:"center",
+            dataIndex: 'zdr'
+          },
+          {
+            title:'会计期间',
+            align:"center",
+            dataIndex: 'kjqj'
+          },
+          {
+            title:'凭证内码',
+            align:"center",
+            dataIndex: 'pznm'
+          },
+          {
+            title:'项目编号',
+            align:"center",
+            dataIndex: 'xmbh'
+          },
+          {
+            title:'项目名称',
+            align:"center",
+            dataIndex: 'xmmc'
+          },
+          {
+            title:'项目类别',
+            align:"center",
+            dataIndex: 'xmlb'
+          },
+          {
+            title:'任务号',
+            align:"center",
+            dataIndex: 'taskno'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/projectChbSxf/projectChbSxf/list",
+          delete: "/projectChbSxf/projectChbSxf/delete",
+          deleteBatch: "/projectChbSxf/projectChbSxf/deleteBatch",
+          exportXlsUrl: "/projectChbSxf/projectChbSxf/exportXls",
+          importExcelUrl: "projectChbSxf/projectChbSxf/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'nd',text:'年度'})
+        fieldList.push({type:'string',value:'pzrq',text:'凭证日期'})
+        fieldList.push({type:'string',value:'pzh',text:'凭证号'})
+        fieldList.push({type:'string',value:'zy',text:'摘要'})
+        fieldList.push({type:'string',value:'kmbh',text:'科目编号'})
+        fieldList.push({type:'string',value:'km',text:'科目名称'})
+        fieldList.push({type:'string',value:'fx',text:'方向'})
+        fieldList.push({type:'number',value:'je',text:'金额'})
+        fieldList.push({type:'string',value:'bm',text:'部门'})
+        fieldList.push({type:'string',value:'wldw',text:'往来单位'})
+        fieldList.push({type:'number',value:'fzje',text:'辅助金额'})
+        fieldList.push({type:'string',value:'zdr',text:'制单人'})
+        fieldList.push({type:'string',value:'kjqj',text:'会计期间'})
+        fieldList.push({type:'string',value:'pznm',text:'凭证内码'})
+        fieldList.push({type:'string',value:'xmbh',text:'项目编号'})
+        fieldList.push({type:'string',value:'xmmc',text:'项目名称'})
+        fieldList.push({type:'string',value:'xmlb',text:'项目类别'})
+        fieldList.push({type:'string',value:'taskno',text:'任务号'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

module_kzks/src/main/java/org/jeecg/modules/projectChbSxf/vue/ProjectChbSxf_menu_insert.sql

@@ -0,0 +1,26 @@
+-- 注意：该页面对应的前台目录为views/projectChbSxf文件夹下
+-- 如果你想更改到其他目录，请修改sql中component字段对应的值
+
+
+INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) 
+VALUES ('2024011908429200240', NULL, 'kzks_project_chb_sxf', '/projectChbSxf/projectChbSxfList', 'projectChbSxf/ProjectChbSxfList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 1, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-01-19 08:42:24', NULL, NULL, 0);
+
+-- 权限控制sql
+-- 新增
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024011908429250241', '2024011908429200240', '添加kzks_project_chb_sxf', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:kzks_project_chb_sxf:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 08:42:24', NULL, NULL, 0, 0, '1', 0);
+-- 编辑
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024011908429250242', '2024011908429200240', '编辑kzks_project_chb_sxf', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:kzks_project_chb_sxf:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 08:42:24', NULL, NULL, 0, 0, '1', 0);
+-- 删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024011908429260243', '2024011908429200240', '删除kzks_project_chb_sxf', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:kzks_project_chb_sxf:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 08:42:24', NULL, NULL, 0, 0, '1', 0);
+-- 批量删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024011908429260244', '2024011908429200240', '批量删除kzks_project_chb_sxf', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:kzks_project_chb_sxf:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 08:42:24', NULL, NULL, 0, 0, '1', 0);
+-- 导出excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024011908429260245', '2024011908429200240', '导出excel_kzks_project_chb_sxf', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:kzks_project_chb_sxf:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 08:42:24', NULL, NULL, 0, 0, '1', 0);
+-- 导入excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024011908429260246', '2024011908429200240', '导入excel_kzks_project_chb_sxf', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:kzks_project_chb_sxf:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-19 08:42:24', NULL, NULL, 0, 0, '1', 0);

module_kzks/src/main/java/org/jeecg/modules/projectChbSxf/vue/modules/ProjectChbSxfForm.vue

@@ -0,0 +1,189 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="年度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nd">
+              <a-input v-model="model.nd" placeholder="请输入年度"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="凭证日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pzrq">
+              <a-input v-model="model.pzrq" placeholder="请输入凭证日期"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="凭证号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pzh">
+              <a-input v-model="model.pzh" placeholder="请输入凭证号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="摘要" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zy">
+              <a-input v-model="model.zy" placeholder="请输入摘要"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="科目编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="kmbh">
+              <a-input v-model="model.kmbh" placeholder="请输入科目编号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="科目名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="km">
+              <a-input v-model="model.km" placeholder="请输入科目名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="方向" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fx">
+              <a-input v-model="model.fx" placeholder="请输入方向"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="je">
+              <a-input-number v-model="model.je" placeholder="请输入金额" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="部门" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bm">
+              <a-input v-model="model.bm" placeholder="请输入部门"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="往来单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wldw">
+              <a-input v-model="model.wldw" placeholder="请输入往来单位"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="辅助金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fzje">
+              <a-input-number v-model="model.fzje" placeholder="请输入辅助金额" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="制单人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zdr">
+              <a-input v-model="model.zdr" placeholder="请输入制单人"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="会计期间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="kjqj">
+              <a-input v-model="model.kjqj" placeholder="请输入会计期间"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="凭证内码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pznm">
+              <a-input v-model="model.pznm" placeholder="请输入凭证内码"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="项目编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="xmbh">
+              <a-input v-model="model.xmbh" placeholder="请输入项目编号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="项目名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="xmmc">
+              <a-input v-model="model.xmmc" placeholder="请输入项目名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="项目类别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="xmlb">
+              <a-input v-model="model.xmlb" placeholder="请输入项目类别"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="任务号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="taskno">
+              <a-input v-model="model.taskno" placeholder="请输入任务号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'ProjectChbSxfForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/projectChbSxf/projectChbSxf/add",
+          edit: "/projectChbSxf/projectChbSxf/edit",
+          queryById: "/projectChbSxf/projectChbSxf/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

module_kzks/src/main/java/org/jeecg/modules/projectChbSxf/vue/modules/ProjectChbSxfModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <project-chb-sxf-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></project-chb-sxf-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import ProjectChbSxfForm from './ProjectChbSxfForm'
+
+  export default {
+    name: 'ProjectChbSxfModal',
+    components: {
+      ProjectChbSxfForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

module_kzks/src/main/java/org/jeecg/modules/projectChbSxf/vue/modules/ProjectChbSxfModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <project-chb-sxf-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></project-chb-sxf-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ProjectChbSxfForm from './ProjectChbSxfForm'
+  export default {
+    name: 'ProjectChbSxfModal',
+    components: {
+      ProjectChbSxfForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

module_kzks/src/main/java/org/jeecg/modules/projectCost/entity/ProjectCost.java

@@ -117,6 +117,10 @@ public class ProjectCost implements Serializable, Cloneable {
 	@Excel(name = "外协费", width = 15)
     @ApiModelProperty(value = "外协费")
     private java.math.BigDecimal wxf;
+    /**筛选费*/
+    @Excel(name = "筛选费", width = 15)
+    @ApiModelProperty(value = "筛选费")
+    private java.math.BigDecimal sxf;
 	/**燃料动力费/（材料费+外协费+事务费+专用费）×1.5%*/
 	@Excel(name = "燃料动力费/（材料费+外协费+事务费+专用费）×1.5%", width = 15)
     @ApiModelProperty(value = "燃料动力费/（材料费+外协费+事务费+专用费）×1.5%")

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

@@ -6,7 +6,7 @@
     <select id="costListByTaskNoMain" resultType="org.jeecg.modules.projectCost.vo.ProjectCostVO">
         select c.id,c.taskno,c.taskname,c.xhname,c.jhwcsj,c.yzjdname,c.processPercent,c.cost_percent,c.yzsl,
                c.one_income,c.one_cost,c.one_profit,c.lre,c.lrl,c.EstimationCoat,c.contractfpe,c.TaskMoney,c.zcb,
-               c.clf ,c.zyf,c.swf,c.wxf,c.rldlf,c.gdzczj,c.gzjlwf,c.glf,IFNULL(c.zjcb,m.value) AS zjcb,c.lbsy ,
+               c.clf ,c.zyf,c.swf,c.wxf,c.sxf,c.rldlf,c.gdzczj,c.gzjlwf,c.glf,IFNULL(c.zjcb,m.value) AS zjcb,c.lbsy ,
                c.workhour,c.zrbm,c.jycsid,c.jycs ,c.hxzxid,c. hxzxname ,c.tasktype,c.AuditPrice,c.iflag,c.Brief,
                c.reftaskno,c.pcCode,c.bcCode,c.blCode,c.business_man_name,c.sjgs,c.scgs,c.status,c.proportion,c.ywfzrname,
                c.clys,c.wxys,c.xhzzrname,
@@ -20,7 +20,7 @@
     <select id="costListByTaskNoSub" resultType="org.jeecg.modules.projectCost.vo.ProjectCostVO">
         select c.id,c.taskno,c.taskname,c.xhname,c.jhwcsj,c.yzjdname,c.processPercent,c.cost_percent,c.yzsl,
                c.one_income,c.one_cost,c.one_profit,c.lre,c.lrl,c.EstimationCoat,c.contractfpe,c.TaskMoney,c.zcb,
-               c.clf ,c.zyf,c.swf,c.wxf,c.rldlf,c.gdzczj,c.gzjlwf,c.glf,IFNULL(c.zjcb,m.value) AS zjcb,c.lbsy ,
+               c.clf ,c.zyf,c.swf,c.wxf,c.sxf,c.rldlf,c.gdzczj,c.gzjlwf,c.glf,IFNULL(c.zjcb,m.value) AS zjcb,c.lbsy ,
                c.workhour,c.zrbm,c.jycsid,c.jycs ,c.hxzxid,c. hxzxname ,c.tasktype,c.AuditPrice,c.iflag,c.Brief,
                c.reftaskno,c.pcCode,c.bcCode,c.blCode,c.business_man_name,c.sjgs,c.scgs,c.status,c.proportion,c.ywfzrname,
                c.clys,c.wxys,c.xhzzrname,

module_kzks/src/main/java/org/jeecg/modules/projectCost/vo/ProjectCostListVO.java

@@ -106,6 +106,10 @@ public class ProjectCostListVO  implements Serializable {
     @Excel(name = "外协费", width = 15)
     @ApiModelProperty(value = "外协费")
     private java.math.BigDecimal wxf;
+    /**筛选费*/
+    @Excel(name = "筛选费", width = 15)
+    @ApiModelProperty(value = "筛选费")
+    private java.math.BigDecimal sxf;
     /**燃料动力费/（材料费+外协费+事务费+专用费）×1.5%*/
     @Excel(name = "燃料动力费/（材料费+外协费+事务费+专用费）×1.5%", width = 15)
     @ApiModelProperty(value = "燃料动力费/（材料费+外协费+事务费+专用费）×1.5%")

module_kzks/src/main/java/org/jeecg/modules/projectCost/vo/ProjectCostVO.java

@@ -106,6 +106,10 @@ public class ProjectCostVO implements Serializable {
     @Excel(name = "外协费", width = 15)
     @ApiModelProperty(value = "外协费")
     private java.math.BigDecimal wxf;
+    /**筛选费*/
+    @Excel(name = "筛选费", width = 15)
+    @ApiModelProperty(value = "筛选费")
+    private java.math.BigDecimal sxf;
     /**燃料动力费/（材料费+外协费+事务费+专用费）×1.5%*/
     @Excel(name = "燃料动力费/（材料费+外协费+事务费+专用费）×1.5%", width = 15)
     @ApiModelProperty(value = "燃料动力费/（材料费+外协费+事务费+专用费）×1.5%")

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/convert/impl/ProjectCostHuijiConverCustomImpl.java

@@ -139,6 +139,7 @@ public class ProjectCostHuijiConverCustomImpl implements ProjectCostHuijiCustomC
             projectCostHuijiListVO.setHjstatus(huiji.getHjstatus());
             projectCostHuijiListVO.setYwfzrname(huiji.getYwfzrname());
             projectCostHuijiListVO.setXhzzrname(huiji.getXhzzrname());
+            projectCostHuijiListVO.setSxf(huiji.getSxf());
         }
         List<ProjectCostVO> list = children;
         if ( list != null ) {

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/entity/ProjectCostHuiji.java

@@ -163,6 +163,10 @@ public class ProjectCostHuiji implements Serializable, Cloneable {
     @Excel(name = "外协费", width = 15)
     @ApiModelProperty(value = "外协费")
     private java.math.BigDecimal wxf;
+    /**筛选费*/
+    @Excel(name = "筛选费", width = 15)
+    @ApiModelProperty(value = "筛选费")
+    private java.math.BigDecimal sxf;
     /**
      * 燃料动力费/（材料费+外协费+事务费+专用费）×1.5%
      */

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/mapper/xml/ProjectCostHuijiMapper.xml

@@ -15,7 +15,7 @@
         select sum(yzsl) as yzsl, sum(lre) as lre,sum(lre)/sum(COALESCE(contractfpe,EstimationCoat)) as
         lrl,sum(EstimationCoat) as EstimationCoat,sum(contractfpe) as contractfpe,
         sum(TaskMoney) as TaskMoney,sum(zcb) as zcb,sum(clf) as clf,sum(zyf) as zyf,sum(swf) as swf,
-        sum(wxf) as wxf,sum(rldlf) as rldlf,sum(gdzczj) as gdzczj,sum(gzjlwf) as gzjlwf,sum(glf) as glf,
+        sum(wxf) as wxf,sum(sxf) as sxf,sum(rldlf) as rldlf,sum(gdzczj) as gdzczj,sum(gzjlwf) as gzjlwf,sum(glf) as glf,
         sum(zjcb) as zjcb,sum(lbsy ) as lbsy,sum(workhour) as workhour,sum(sjgs) as sjgs,
         sum(scgs) as scgs,sum(clys) as clys,sum(wxys) as wxys
         from kzks_project_cost_huiji
@@ -41,7 +41,7 @@
         select sum(yzsl) as yzsl,sum(lre) as lre,sum(lre)/sum(COALESCE(contractfpe,EstimationCoat)) as
         lrl,sum(EstimationCoat) as EstimationCoat,sum(contractfpe) as contractfpe,
         sum(TaskMoney) as TaskMoney,sum(zcb) as zcb,sum(clf) as clf,sum(zyf) as zyf,sum(swf) as swf,
-        sum(wxf) as wxf,sum(rldlf) as rldlf,sum(gdzczj) as gdzczj,sum(gzjlwf) as gzjlwf,sum(glf) as glf,
+        sum(wxf) as wxf,sum(sxf) as sxf,sum(rldlf) as rldlf,sum(gdzczj) as gdzczj,sum(gzjlwf) as gzjlwf,sum(glf) as glf,
         sum(zjcb) as zjcb,sum(lbsy ) as lbsy,sum(workhour) as workhour,sum(sjgs) as sjgs,
         sum(scgs) as scgs,sum(clys) as clys,sum(wxys) as wxys
         from kzks_project_cost
@@ -67,7 +67,7 @@
         select sum(yzsl) as yzsl, sum(lre) as lre,sum(lre)/sum(COALESCE(contractfpe,EstimationCoat)) as
         lrl,sum(EstimationCoat) as EstimationCoat,sum(contractfpe) as contractfpe,
         sum(TaskMoney) as TaskMoney,sum(zcb) as zcb,sum(clf) as clf,sum(zyf) as zyf,sum(swf) as swf,
-        sum(wxf) as wxf,sum(rldlf) as rldlf,sum(gdzczj) as gdzczj,sum(gzjlwf) as gzjlwf,sum(glf) as glf,
+        sum(wxf) as wxf,sum(sxf) as sxf,sum(rldlf) as rldlf,sum(gdzczj) as gdzczj,sum(gzjlwf) as gzjlwf,sum(glf) as glf,
         sum(zjcb) as zjcb,sum(lbsy ) as lbsy,sum(workhour) as workhour,sum(sjgs) as sjgs,
         sum(scgs) as scgs,sum(clys) as clys,sum(wxys) as wxys
         from kzks_project_cost_huiji
@@ -80,7 +80,7 @@
             resultType="org.jeecg.modules.projectCostHuiji.entity.ProjectCostHuiji">
         select sum(lre) as lre,sum(EstimationCoat) as EstimationCoat,sum(contractfpe) as contractfpe,
         sum(TaskMoney) as TaskMoney,sum(zcb) as zcb,sum(clf) as clf,sum(zyf) as zyf,sum(swf) as swf,
-        sum(wxf) as wxf,sum(rldlf) as rldlf,sum(gdzczj) as gdzczj,sum(gzjlwf) as gzjlwf,sum(glf) as glf,
+        sum(wxf) as wxf,sum(sxf) as sxf,sum(rldlf) as rldlf,sum(gdzczj) as gdzczj,sum(gzjlwf) as gzjlwf,sum(glf) as glf,
         sum(zjcb) as zjcb,sum(lbsy ) as lbsy,sum(workhour) as workhour,sum(sjgs) as sjgs,
         sum(scgs) as scgs,sum(clys) as clys,sum(wxys) as wxys
         from kzks_project_cost
@@ -93,7 +93,7 @@
         select sum(yzsl) as yzsl, sum(lre) as lre,sum(lre)/sum(COALESCE(contractfpe,EstimationCoat)) as
         lrl,sum(EstimationCoat) as EstimationCoat,sum(contractfpe) as contractfpe,
         sum(TaskMoney) as TaskMoney,sum(zcb) as zcb,sum(clf) as clf,sum(zyf) as zyf,sum(swf) as swf,
-        sum(wxf) as wxf,sum(rldlf) as rldlf,sum(gdzczj) as gdzczj,sum(gzjlwf) as gzjlwf,sum(glf) as glf,
+        sum(wxf) as wxf,sum(sxf) as sxf,sum(rldlf) as rldlf,sum(gdzczj) as gdzczj,sum(gzjlwf) as gzjlwf,sum(glf) as glf,
         sum(zjcb) as zjcb,sum(lbsy ) as lbsy,sum(workhour) as workhour,sum(sjgs) as sjgs,
         sum(scgs) as scgs,sum(clys) as clys,sum(wxys) as wxys
         from kzks_project_cost_huiji

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/vo/ProjectCostHuijiListVO.java

@@ -118,6 +118,10 @@ public class ProjectCostHuijiListVO implements Serializable {
     @Excel(name = "外协费", width = 15)
     @ApiModelProperty(value = "外协费")
     private java.math.BigDecimal wxf;
+    /**筛选费*/
+    @Excel(name = "筛选费", width = 15)
+    @ApiModelProperty(value = "筛选费")
+    private java.math.BigDecimal sxf;
     /**燃料动力费/（材料费+外协费+事务费+专用费）×1.5%*/
     @Excel(name = "燃料动力费/（材料费+外协费+事务费+专用费）×1.5%", width = 15)
     @ApiModelProperty(value = "燃料动力费/（材料费+外协费+事务费+专用费）×1.5%")

module_kzks/src/main/java/org/jeecg/modules/projectImportList/convert/CHBConvert.java

@@ -5,6 +5,7 @@ import org.jeecg.modules.projectChbGlf.entity.ProjectChbGlf;
 import org.jeecg.modules.projectChbRdf.entity.ProjectChbRdf;
 import org.jeecg.modules.projectChbRgf.entity.ProjectChbRgf;
 import org.jeecg.modules.projectChbSwf.entity.ProjectChbSwf;
+import org.jeecg.modules.projectChbSxf.entity.ProjectChbSxf;
 import org.jeecg.modules.projectChbWxf.entity.ProjectChbWxf;
 import org.jeecg.modules.projectChbZjf.entity.ProjectChbZjf;
 import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyf;
@@ -34,4 +35,6 @@ public interface CHBConvert {
     ProjectChbGlf toGLF(ProjectChb chb);
 
     ProjectChbRgf toRGF(ProjectChb chb);
+
+    ProjectChbSxf toSXF(ProjectChb chb);
 }

module_kzks/src/main/java/org/jeecg/modules/projectImportList/service/impl/ProjectImportListServiceImpl.java

@@ -11,6 +11,8 @@ import org.jeecg.modules.projectChbRgf.entity.ProjectChbRgf;
 import org.jeecg.modules.projectChbRgf.service.IKzksProjectChbRgfService;
 import org.jeecg.modules.projectChbSwf.entity.ProjectChbSwf;
 import org.jeecg.modules.projectChbSwf.service.IProjectChbSwfService;
+import org.jeecg.modules.projectChbSxf.entity.ProjectChbSxf;
+import org.jeecg.modules.projectChbSxf.service.IProjectChbSxfService;
 import org.jeecg.modules.projectChbWxf.entity.ProjectChbWxf;
 import org.jeecg.modules.projectChbWxf.service.IProjectChbWxfService;
 import org.jeecg.modules.projectChbZjf.entity.ProjectChbZjf;
@@ -65,6 +67,8 @@ public class ProjectImportListServiceImpl extends ServiceImpl<ProjectImportListM
     private IKzksProjectChbGlfService glfService;
     @Autowired
     private IKzksProjectChbRgfService rgfService;
+    @Autowired
+    private IProjectChbSxfService sxfService;
 
     //    public List<TasknoAndNd> addTNlist(List<TasknoAndNd> tnList, String taskno, String nd){
     public List<TasknoAndNd> addTNlist(List<TasknoAndNd> tnList, String nd) {
@@ -111,6 +115,7 @@ public class ProjectImportListServiceImpl extends ServiceImpl<ProjectImportListM
             List<ProjectChbZjf> zjfList = new ArrayList<>();//折旧费
             List<ProjectChbGlf> glfList = new ArrayList<>();//管理费
             List<ProjectChbRgf> rgfList = new ArrayList<>();//人工费
+            ArrayList<ProjectChbSxf> sxfList = new ArrayList<>(); // 筛选费
 
             List<TasknoAndNd> tnSWFList = new ArrayList<>();//事务费任务号年度集合——用于删除
             List<TasknoAndNd> tnZYFList = new ArrayList<>();//专用费任务号年度集合——用于删除
@@ -119,6 +124,7 @@ public class ProjectImportListServiceImpl extends ServiceImpl<ProjectImportListM
             List<TasknoAndNd> tnZJFList = new ArrayList<>();//折旧费任务号年度集合——用于删除
             List<TasknoAndNd> tnGLFList = new ArrayList<>();//管理费任务号年度集合——用于删除
             List<TasknoAndNd> tnRGFList = new ArrayList<>();//人工费任务号年度集合——用于删除
+            List<TasknoAndNd> tnSXFList = new ArrayList<>();//筛选费任务号年度集合——用于删除
 
             for (ProjectChb chb : list) {
                 String taskno = chb.getTaskno();
@@ -147,6 +153,9 @@ public class ProjectImportListServiceImpl extends ServiceImpl<ProjectImportListM
                     } else if (Objects.equals(fylb, "人工费")) {
                         rgfList.add(CHBConvert.INSTANCE.toRGF(chb));
                         tnRGFList = addTNlist(tnRGFList, nd);
+                    }else if (Objects.equals(fylb, "筛选费")) {
+                        sxfList.add(CHBConvert.INSTANCE.toSXF(chb));
+                        tnSXFList = addTNlist(tnSXFList, nd);
                     }
                 }
             }
@@ -203,7 +212,13 @@ public class ProjectImportListServiceImpl extends ServiceImpl<ProjectImportListM
                 }
             }
             rgfService.saveBatch(rgfList);
-
+            for (TasknoAndNd tasknoAndNd : tnSXFList) {
+                int count = sxfService.getIfHaveThisNd(tasknoAndNd.getNd());
+                if (count != 0) {
+                    sxfService.deleteWxfByNd(tasknoAndNd.getNd());
+                }
+            }
+            sxfService.saveBatch(sxfList);
             log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒," + "数据行数：" + list.size());
             //update-end-author:taoyan date:20190528 for:批量插入数据
             return Result.ok("文件导入成功！数据行数：" + list.size());