首页合同额、收款额、成本额详情+导出

module_kzks/src/main/java/org/jeecg/modules/Index/controller/IndexController.java

@@ -16,23 +16,41 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.Index.entity.dto.IndexInfoParamDto;
 import org.jeecg.modules.Index.entity.kpi.IndexKpiCompletByDate;
 import org.jeecg.modules.Index.entity.kpi.IndexKpiDataDepart;
+import org.jeecg.modules.Index.entity.kpi.IndexKpiDetail;
 import org.jeecg.modules.Index.entity.kpi.IndexKpiParamDto;
 import org.jeecg.modules.Index.entity.vo.IndexChartInfoVo;
 import org.jeecg.modules.Index.entity.vo.*;
 import org.jeecg.modules.Index.service.IndexKpiService;
+import org.jeecg.modules.Index.service.IndexNewServer;
 import org.jeecg.modules.Index.service.IndexService;
 import org.jeecg.modules.Index.service.IndexZcbService;
 import org.jeecg.modules.Index.util.AuthMark;
 import org.jeecg.modules.Index.util.CommonMethod;
+import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNew;
+import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewHTEVO;
+import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewYSKVO;
+import org.jeecg.modules.comContractInfoExchangeNew.service.IComContractInfoExchangeNewService;
 import org.jeecg.modules.costModelClPrice.entity.KzksCostModelClPrice;
 import org.jeecg.modules.dataSourceSwitch.annotation.TargetDataSource;
+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;
+import org.jeecg.modules.wzOutboundOrderBNew.entity.WzOutboundOrderBNew;
 import org.jeecg.modules.xmcbDetail.entity.ComContractInfoExchange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 
@@ -56,6 +74,14 @@ public class IndexController {
     @Autowired
     private CommonMethod commonMethod;
 
+    @Autowired
+    @SuppressWarnings("all")
+    private IndexNewServer indexNewServer;
+
+    @Autowired
+    @SuppressWarnings("all")
+    private IComContractInfoExchangeNewService comContractInfoExchangeNewService;
+
     @ApiOperation(value = "首页一层汇总", notes = "首页一层汇总")
     @PostMapping("getCollect")
     @TargetDataSource
@@ -235,5 +261,162 @@ public class IndexController {
     }
 
 
+    @ApiOperation(value = "首页一层当月合同额明细(新)", notes = "首页一层当月合同额明细(新)")
+    @GetMapping("/getDetailIncomeNew")
+    public Result<IPage<ComContractInfoExchangeNewHTEVO>> getDetailIncomeNew(@RequestParam(required = false) List<String> departNameList, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                                             @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest request){
+        Page<ComContractInfoExchangeNewHTEVO> page = new Page<ComContractInfoExchangeNewHTEVO>(pageNo, pageSize);
+        List<ComContractInfoExchangeNewHTEVO> pageList = indexNewServer.getDetailIncome(page, request, departNameList);
+        page.setRecords(pageList);
+        return Result.OK(page);
+    }
+
+    @ApiOperation(value="首页一层当月合同额明细——导出excel")
+    @RequestMapping(value = "/exportNewHTEDetail")
+    public ModelAndView exportNewHTEDetail(@RequestParam(required = false) List<String> departNameList,HttpServletRequest request) {
+        List<ComContractInfoExchangeNewHTEVO> list = indexNewServer.getAllDetailIncome(request,departNameList);
+        return comContractInfoExchangeNewService.exportHteDetail(list,ComContractInfoExchangeNewHTEVO.class, "当月合同额明细");
+    }
+
+    @ApiOperation(value = "首页一层当月收款额明细(新)", notes = "首页一层当月收款额明细(新)")
+    @GetMapping("/getDetailReceivedNew")
+    public Result<IPage<ComContractInfoExchangeNewYSKVO>> getDetailReceivedNew(@RequestParam(required = false) List<String> departNameList, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                                    @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest request){
+        Page<ComContractInfoExchangeNewYSKVO> page = new Page<ComContractInfoExchangeNewYSKVO>(pageNo, pageSize);
+        List<ComContractInfoExchangeNewYSKVO> pageList = indexNewServer.getDetailReceived(page, request, departNameList);
+        page.setRecords(pageList);
+        return Result.OK(page);
+    }
+
+    @ApiOperation(value="首页一层当月已收款明细——导出excel")
+    @RequestMapping(value = "/exportNewYSKDetail")
+    public ModelAndView exportNewYSKDetail(@RequestParam(required = false) List<String> departNameList,HttpServletRequest request) {
+        List<ComContractInfoExchangeNewYSKVO> list = indexNewServer.getAllDetailReceived(request,departNameList);
+        return comContractInfoExchangeNewService.exportYskDetail(list,ComContractInfoExchangeNewYSKVO.class, "当月已收款明细");
+    }
+
+
+    @ApiOperation(value = "首页一层当月材料费明细(新)", notes = "首页一层当月材料费明细(新)")
+    @GetMapping("/getClfDetailNew")
+    public Result<IPage<WzOutboundOrderBNew>> getClfDetailNew(@RequestParam(required = false) List<String> departNameList, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                                 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest request){
+        Page<WzOutboundOrderBNew> page = new Page<WzOutboundOrderBNew>(pageNo, pageSize);
+        List<WzOutboundOrderBNew> pageList = indexNewServer.getClfDetailList(page, request, departNameList);
+        page.setRecords(pageList);
+        return Result.OK(page);
+    }
+
+    @ApiOperation(value = "首页一层当月专用费明细(新)", notes = "首页一层当月专用费明细(新)")
+    @GetMapping("/getZyfDetailNew")
+    public Result<IPage<ProjectChbZyf>> getZyfDetailNew(@RequestParam(required = false) List<String> departNameList, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                        @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest request){
+        Page<ProjectChbZyf> page = new Page<ProjectChbZyf>(pageNo, pageSize);
+        List<ProjectChbZyf> pageList = indexNewServer.getZyfDetailList(page, request, departNameList);
+        page.setRecords(pageList);
+        return Result.OK(page);
+    }
+
+    @ApiOperation(value = "首页一层当月事务费明细(新)", notes = "首页一层当月事务费明细(新)")
+    @GetMapping("/getSwfDetailNew")
+    public Result<IPage<ProjectChbSwf>> getSwfDetailNew(@RequestParam(required = false) List<String> departNameList, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                        @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest request){
+        Page<ProjectChbSwf> page = new Page<ProjectChbSwf>(pageNo, pageSize);
+        List<ProjectChbSwf> pageList = indexNewServer.getSwfDetailList(page, request, departNameList);
+        page.setRecords(pageList);
+        return Result.OK(page);
+    }
+
+    @ApiOperation(value = "首页一层当月外协费明细(新)", notes = "首页一层当月外协费明细(新)")
+    @GetMapping("/getWxfDetailNew")
+    public Result<IPage<ProjectChbWxf>> getWxfDetailNew(@RequestParam(required = false) List<String> departNameList, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                        @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest request){
+        Page<ProjectChbWxf> page = new Page<ProjectChbWxf>(pageNo, pageSize);
+        List<ProjectChbWxf> pageList = indexNewServer.getWxfDetailList(page, request, departNameList);
+        page.setRecords(pageList);
+        return Result.OK(page);
+    }
 
+    @ApiOperation(value = "首页一层当月燃料动力费明细(新)", notes = "首页一层当月燃料动力费明细(新)")
+    @GetMapping("/getRdfDetailNew")
+    public Result<IPage<ProjectChbRdf>> getRdfDetailNew(@RequestParam(required = false) List<String> departNameList, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                        @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest request){
+        Page<ProjectChbRdf> page = new Page<ProjectChbRdf>(pageNo, pageSize);
+        List<ProjectChbRdf> pageList = indexNewServer.getRdfDetailList(page, request, departNameList);
+        page.setRecords(pageList);
+        return Result.OK(page);
+    }
+
+    @ApiOperation(value = "首页一层当月固定资产折旧费明细(新)", notes = "首页一层当月固定资产折旧费明细(新)")
+    @GetMapping("/getZjfDetailNew")
+    public Result<IPage<ProjectChbZjf>> getZjfDetailNew(@RequestParam(required = false) List<String> departNameList, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                        @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest request){
+        Page<ProjectChbZjf> page = new Page<ProjectChbZjf>(pageNo, pageSize);
+        List<ProjectChbZjf> pageList = indexNewServer.getZjfDetailList(page, request, departNameList);
+        page.setRecords(pageList);
+        return Result.OK(page);
+    }
+
+    @ApiOperation(value = "首页一层当月工资及劳务费明细(新)", notes = "首页一层当月工资及劳务费明细(新)")
+    @GetMapping("/getRgfDetailNew")
+    public Result<IPage<ProjectChbRgf>> getRgfDetailNew(@RequestParam(required = false) List<String> departNameList, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                        @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest request){
+        Page<ProjectChbRgf> page = new Page<ProjectChbRgf>(pageNo, pageSize);
+        List<ProjectChbRgf> pageList = indexNewServer.getRgfDetailList(page, request, departNameList);
+        page.setRecords(pageList);
+        return Result.OK(page);
+    }
+
+    @ApiOperation(value = "首页一层当月管理费明细(新)", notes = "首页一层当月管理费明细(新)")
+    @GetMapping("/getGlfDetailNew")
+    public Result<IPage<ProjectChbGlf>> getGlfDetailNew(@RequestParam(required = false) List<String> departNameList, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                        @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest request){
+        Page<ProjectChbGlf> page = new Page<ProjectChbGlf>(pageNo, pageSize);
+        List<ProjectChbGlf> pageList = indexNewServer.getGlfDetailList(page, request, departNameList);
+        page.setRecords(pageList);
+        return Result.OK(page);
+    }
+
+    @ApiOperation(value = "首页一层当月筛选费明细(新)", notes = "首页一层当月筛选费明细(新)")
+    @GetMapping("/getSxfDetailNew")
+    public Result<IPage<ProjectChbSxf>> getSxfDetailNew(@RequestParam(required = false) List<String> departNameList, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                        @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest request){
+        Page<ProjectChbSxf> page = new Page<ProjectChbSxf>(pageNo, pageSize);
+        List<ProjectChbSxf> pageList = indexNewServer.getSxfDetailList(page, request, departNameList);
+        page.setRecords(pageList);
+        return Result.OK(page);
+    }
+
+    @ApiOperation(value="首页一层导出成本额的详情excel")
+    @RequestMapping(value = "/exportCneXls")
+    public void exportXls(@RequestParam(required = false) List<String> departNameList,HttpServletRequest request) {
+        //return indexNewServer.exportCbeDetail(departNameList,request, WzOutboundOrderBNew.class, "成本额详情");
+        indexNewServer.exportCbeDetail(departNameList,request);
+    }
+
+    @ApiOperation(value="首页三层指标排行——查询责任部门当期完成额")
+    @RequestMapping(value = "/getZrbmDepartKpiDetail")
+    public Result<IPage<IndexKpiDetail>> getZrbmDepartKpiDetail(IndexKpiParamDto indexKpiParamDto,@RequestParam(required = false) String departName, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest request) {
+        Page<IndexKpiDetail> page = new Page<IndexKpiDetail>(pageNo, pageSize);
+        List<IndexKpiDetail> pageList = indexNewServer.getZrbmDepartKpiDetailList(page, request, indexKpiParamDto,departName);
+        page.setRecords(pageList);
+        return Result.OK(page);
+    }
+
+    @ApiOperation(value="首页三层指标排行——查询责任部门当期完成额")
+    @RequestMapping(value = "/getXdbmHteDepartKpiDetail")
+    public Result<IPage<ComContractInfoExchangeNewHTEVO>> getXdbmHteDepartKpiDetail(IndexKpiParamDto indexKpiParamDto,@RequestParam(required = false) String departName, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest request) {
+        Page<ComContractInfoExchangeNewHTEVO> page = new Page<ComContractInfoExchangeNewHTEVO>(pageNo, pageSize);
+        List<ComContractInfoExchangeNewHTEVO> pageList = indexNewServer.getXdbmHteDepartKpiDetailList(page, request,indexKpiParamDto, departName);
+        page.setRecords(pageList);
+        return Result.OK(page);
+    }
+
+    @ApiOperation(value="首页三层指标排行——查询责任部门当期完成额")
+    @RequestMapping(value = "/getXdbmYskDepartKpiDetail")
+    public Result<IPage<ComContractInfoExchangeNewYSKVO>> getXdbmYskDepartKpiDetail(IndexKpiParamDto indexKpiParamDto,@RequestParam(required = false) String departName, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest request) {
+        Page<ComContractInfoExchangeNewYSKVO> page = new Page<ComContractInfoExchangeNewYSKVO>(pageNo, pageSize);
+        List<ComContractInfoExchangeNewYSKVO> pageList = indexNewServer.getXdbmYskDepartKpiDetailList(page, request,indexKpiParamDto, departName);
+        page.setRecords(pageList);
+        return Result.OK(page);
+    }
 }

module_kzks/src/main/java/org/jeecg/modules/Index/entity/kpi/IndexKpiDetail.java

@@ -0,0 +1,42 @@
+package org.jeecg.modules.Index.entity.kpi;
+
+import lombok.Data;
+
+/**
+ * @author dzc
+ * @date 2024/6/19 10:06
+ * @package org.jeecg.modules.Index.entity.kpi
+ * @project yecai_server
+ * @des
+ */
+@Data
+public class IndexKpiDetail {
+
+    /** 部门名称 */
+    private String depart;
+
+    /** 任务号 */
+    private String taskno;
+
+    /** 任务名称 */
+    private String taskname;
+
+    /** 合同额 */
+    private String hte;
+
+    /** 已收款 */
+    private String ysk;
+
+    /** 预估价 */
+    private String ygj;
+
+    /** 上个月进度 */
+    private String lastjd;
+
+    /** 当月进度 */
+    private String nowjd;
+
+    /** 进度差 */
+    private String newjd;
+
+}

module_kzks/src/main/java/org/jeecg/modules/Index/mapper/IndexKpiMapper.java

@@ -4,6 +4,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.Index.entity.kpi.IndexKpiCompletByDate;
+import org.jeecg.modules.Index.entity.kpi.IndexKpiDetail;
 import org.jeecg.modules.dataSourceSwitch.annotation.TargetDataSource;
 
 import java.util.List;
@@ -61,4 +62,9 @@ public interface IndexKpiMapper {
 
     List<IndexKpiCompletByDate> getHteReceivedZrbmSelectYm(@Param("finalDateYm") String finalDateYm,@Param("finalDateLastYm") String finalDateLastYm,@Param("departList") List<String> zrbmList);
 
+    List<IndexKpiDetail> getHteReceivedZrbmSelectYmDetail(@Param("dateYm") String dateYm,@Param("dateLastYm") String dateLastYm,@Param("departName") String departName);
+
+    List<IndexKpiDetail> getFinallNumDetailList(@Param("dateLastYm") String dateLastYm,@Param("departName") String departName);
+
+    List<IndexKpiDetail> getNewNumDetailList(@Param("dateLastYm") String dateLastYm,@Param("departName") String departName);
 }

module_kzks/src/main/java/org/jeecg/modules/Index/mapper/xml/IndexKpiMapper.xml

@@ -144,4 +144,42 @@
         ) e group by e.depart
     </select>
 
+
+
+    <select id="getHteReceivedZrbmSelectYmDetail" resultType="org.jeecg.modules.Index.entity.kpi.IndexKpiDetail">
+        select k.taskno as taskno, k.taskname as taskname, k.zrbm as depart, k.contractfpe as hte, k.EstimationCoat as ygj,m.nowjd as nowjd,m.lastjd as lastjd,(CASE WHEN IFNULL((m.nowjd-m.lastjd)/100,0) <![CDATA[ < ]]> 0 THEN (m.nowjd-m.lastjd) = 0 ELSE IFNULL((m.nowjd-m.lastjd)/100,0) END) as newJd,k.TaskMoney as ysk
+        from kzks_project_cost k
+        left join
+        (select km.taskno, km.newprocessPercent AS nowjd,IFNULL(kt.newprocessPercent,0) as lastjd
+        from
+        (select zrbm,taskno, IFNULL(processPercent,0) AS newprocessPercent from kzks_kpi_project_month where ym = #{dateYm}) km
+        left join
+        (select taskno, IFNULL(processPercent,0) AS newprocessPercent from kzks_kpi_project_month where ym = #{dateLastYm}) kt on km.taskno = kt.taskno
+        where km.zrbm = #{departName}
+        ) m on k.taskno = m.taskno
+        where k.status != '1' and k.zrbm = #{departName}
+    </select>
+
+
+    <select id="getFinallNumDetailList" resultType="org.jeecg.modules.Index.entity.kpi.IndexKpiDetail">
+        select k.taskno as taskno,k.taskname as taskname, k.zrbm as depart, k.contractfpe as hte, k.EstimationCoat as ygj,k.processPercent as nowjd,m.processPercent as lastjd,(CASE WHEN IFNULL((k.processPercent-m.processPercent)/100,0) <![CDATA[ < ]]> 0 THEN (k.processPercent-m.processPercent) = 0 ELSE IFNULL((k.processPercent-m.processPercent)/100,0) END) as newJd,k.TaskMoney as ysk
+        from kzks_project_cost k
+        left join kzks_kpi_project_month m on k.taskno = m.taskno
+        where k.status != '1' and k.zrbm = #{departName}
+        and m.ym =#{dateLastYm}
+    </select>
+
+    <select id="getNewNumDetailList" resultType="org.jeecg.modules.Index.entity.kpi.IndexKpiDetail">
+        select taskno,taskname, zrbm as depart, contractfpe as hte,EstimationCoat as ygj, processPercent as nowjd,0 as lastjd,processPercent as newjd,TaskMoney as ysk
+        from kzks_project_cost
+        where status != '1' and zrbm = #{departName}
+        and taskno not in (
+        select k.taskno
+        from kzks_project_cost k
+        left join kzks_kpi_project_month m
+        on k.taskno = m.taskno
+        where k.status != '1' and k.zrbm = #{departName}
+        and m.ym = #{dateLastYm}
+        ) group by zrbm
+    </select>
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/Index/service/IndexNewServer.java

@@ -0,0 +1,75 @@
+package org.jeecg.modules.Index.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.Index.entity.kpi.IndexKpiDetail;
+import org.jeecg.modules.Index.entity.kpi.IndexKpiParamDto;
+import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNew;
+import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewHTEVO;
+import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewYSKVO;
+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;
+import org.jeecg.modules.wzOutboundOrderBNew.entity.WzOutboundOrderBNew;
+import org.jeecg.modules.xmcbDetail.entity.ComContractInfoExchange;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @author dzc
+ * @date 2024/6/18 10:24
+ * @package org.jeecg.modules.Index.service
+ * @project yecai_server
+ * @des
+ */
+public interface IndexNewServer {
+
+    /*合同额一层 当月合同额明细*/
+    List<ComContractInfoExchangeNewHTEVO> getDetailIncome(Page<ComContractInfoExchangeNewHTEVO> page, HttpServletRequest request, List<String> departNameList);
+
+    /*已收款一层  当月收款额明细*/
+    List<ComContractInfoExchangeNewYSKVO> getDetailReceived(Page<ComContractInfoExchangeNewYSKVO> page, HttpServletRequest request, List<String> departNameList);
+
+    List<ComContractInfoExchangeNewHTEVO> getAllDetailIncome(HttpServletRequest request,List<String> departNameList);
+    List<ComContractInfoExchangeNewYSKVO> getAllDetailReceived(HttpServletRequest request, List<String> departNameList);
+
+    /* 一层材料费明细 */
+    List<WzOutboundOrderBNew> getClfDetailList(Page<WzOutboundOrderBNew> page, HttpServletRequest request, List<String> departNameList);
+
+    /* 一层专用费明细 */
+    List<ProjectChbZyf> getZyfDetailList(Page<ProjectChbZyf> page, HttpServletRequest request, List<String> departNameList);
+
+    /* 一层事务费明细 */
+    List<ProjectChbSwf> getSwfDetailList(Page<ProjectChbSwf> page, HttpServletRequest request, List<String> departNameList);
+
+    /* 一层外协费明细 */
+    List<ProjectChbWxf> getWxfDetailList(Page<ProjectChbWxf> page, HttpServletRequest request, List<String> departNameList);
+
+    /* 一层燃料动力费明细 */
+    List<ProjectChbRdf> getRdfDetailList(Page<ProjectChbRdf> page, HttpServletRequest request, List<String> departNameList);
+
+    /* 一层固定资产折旧费明细 */
+    List<ProjectChbZjf> getZjfDetailList(Page<ProjectChbZjf> page, HttpServletRequest request, List<String> departNameList);
+
+    /* 一层工资及劳务费明细 */
+    List<ProjectChbRgf> getRgfDetailList(Page<ProjectChbRgf> page, HttpServletRequest request, List<String> departNameList);
+
+    /* 一层管理费明细 */
+    List<ProjectChbGlf> getGlfDetailList(Page<ProjectChbGlf> page, HttpServletRequest request, List<String> departNameList);
+
+    /* 一层筛选费明细 */
+    List<ProjectChbSxf> getSxfDetailList(Page<ProjectChbSxf> page, HttpServletRequest request, List<String> departNameList);
+
+    void exportCbeDetail(List<String> departNameList, HttpServletRequest request);
+
+    List<IndexKpiDetail> getZrbmDepartKpiDetailList(Page<IndexKpiDetail> page, HttpServletRequest request, IndexKpiParamDto indexKpiParamDto, String departName);
+
+    List<ComContractInfoExchangeNewHTEVO> getXdbmHteDepartKpiDetailList(Page<ComContractInfoExchangeNewHTEVO> page, HttpServletRequest request, IndexKpiParamDto indexKpiParamDto, String departName);
+
+    List<ComContractInfoExchangeNewYSKVO> getXdbmYskDepartKpiDetailList(Page<ComContractInfoExchangeNewYSKVO> page, HttpServletRequest request, IndexKpiParamDto indexKpiParamDto, String departName);
+}

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

@@ -1,6 +1,7 @@
 package org.jeecg.modules.comContractInfoExchangeNew.mapper;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -105,4 +106,22 @@ public interface ComContractInfoExchangeNewMapper extends BaseMapper<ComContract
     BigDecimal getHteByTaskno(String taskno);
 
     BigDecimal getYskByTaskno(String taskno);
+
+    List<ComContractInfoExchangeNewHTEVO> getIncomeDetailByTasknoListAndByQsrqRangeNew(Page<ComContractInfoExchangeNewHTEVO> page, @Param("tasknoList") List<String> tasknoList, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+
+    List<ComContractInfoExchangeNewHTEVO> getIncomeDetailByTasknoListAndByQsrqRangeIfBossNew(Page<ComContractInfoExchangeNewHTEVO> page,@Param("tasknoList") List<String> tasknoList, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+
+    List<ComContractInfoExchangeNewYSKVO> getReceivedDetailByTasknoListAndByQsrqRangeNew(Page<ComContractInfoExchangeNewYSKVO> page,  @Param("tasknoList") List<String> tasknoList, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+
+    List<ComContractInfoExchangeNewYSKVO> getReceivedDetailByTasknoListAndByQsrqRangeIfBossNew(Page<ComContractInfoExchangeNewYSKVO> page, @Param("tasknoList") List<String> tasknoList, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+
+    List<ComContractInfoExchangeNewHTEVO> getIncomeDetailByTasknoListAndByQsrqRangeNew1(@Param("tasknoList") List<String> tasknoList, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+    List<ComContractInfoExchangeNewHTEVO> getIncomeDetailByTasknoListAndByQsrqRangeIfBossNew1(@Param("tasknoList") List<String> tasknoList, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+
+    List<ComContractInfoExchangeNewYSKVO> getReceivedDetailByTasknoListAndByQsrqRangeNew1(@Param("tasknoList") List<String> tasknoList, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+    List<ComContractInfoExchangeNewYSKVO> getReceivedDetailByTasknoListAndByQsrqRangeIfBossNew1(@Param("tasknoList") List<String> tasknoList, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+
+    List<ComContractInfoExchangeNewHTEVO> getXdbmHteDetail(@Param("selectDate") String selectDate,@Param("departName") String departName);
+
+    List<ComContractInfoExchangeNewYSKVO> getXdbmYskDetail(@Param("selectDate") String selectDate,@Param("departName") String departName);
 }

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

@@ -368,4 +368,117 @@
         where  sjly = 40 and  rwbh = #{taskno}
     </select>
 
+    <select id="getIncomeDetailByTasknoListAndByQsrqRangeNew" resultType="org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewHTEVO">
+        select id,serialno,htid,zhtbh,htbh,htname,qsrq,jf,jfjc,htje,zc,htdk,htdsk,htykp,htdkp,rwbh,rwname,
+        cpxh,jd,yzbm,rwyingsk,rwyisk,fptypeone,fpjeone,ykpeone,fptypetwo,fpjetwo,ykpetwo,htzgbm,ywy,htlxqk,
+        htztsm,skdh,zxzt,fkfmc,yhjc,httype,xh,sl,bm,skzje,rwskje,dkhpdqrq,sktype,skkmdm,pzh,ywbm,lrr,lrrq,jylsh,jyid,
+        hph,hpid,skdw,sjly
+        from com_contract_info_exchange_new as a where a.sjly = 20
+        and a.qsrq <![CDATA[ >= ]]> #{beginDate}
+        and a.qsrq &lt; #{endDate}
+        and a.rwbh in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+    </select>
+
+    <select id="getIncomeDetailByTasknoListAndByQsrqRangeIfBossNew" resultType="org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewHTEVO">
+        select id,serialno,htid,zhtbh,htbh,htname,qsrq,jf,jfjc,htje,zc,htdk,htdsk,htykp,htdkp,rwbh,rwname,
+               cpxh,jd,yzbm,rwyingsk,rwyisk,fptypeone,fpjeone,ykpeone,fptypetwo,fpjetwo,ykpetwo,htzgbm,ywy,htlxqk,
+               htztsm,skdh,zxzt,fkfmc,yhjc,httype,xh,sl,bm,skzje,rwskje,dkhpdqrq,sktype,skkmdm,pzh,ywbm,lrr,lrrq,jylsh,jyid,
+               hph,hpid,skdw,sjly
+        from com_contract_info_exchange_new as a where a.sjly = 20
+                                                   and a.qsrq <![CDATA[ >= ]]> #{beginDate}
+                                                   and a.qsrq &lt; #{endDate}
+    </select>
+
+    <select id="getReceivedDetailByTasknoListAndByQsrqRangeNew" resultType="org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewYSKVO">
+        select * from com_contract_info_exchange_new as a where sjly = 40
+        and a.dkhpdqrq <![CDATA[ >= ]]> #{beginDate}
+        and a.dkhpdqrq &lt; #{endDate}
+        and a.rwbh in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+    </select>
+
+    <select id="getReceivedDetailByTasknoListAndByQsrqRangeIfBossNew" resultType="org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewYSKVO">
+        select * from com_contract_info_exchange_new as a where sjly = 40
+        and a.dkhpdqrq  <![CDATA[ >= ]]> #{beginDate}
+        and a.dkhpdqrq &lt; #{endDate}
+    </select>
+
+    <select id="getIncomeDetailByTasknoListAndByQsrqRangeNew1" resultType="org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewHTEVO">
+        select id,serialno,htid,zhtbh,htbh,htname,qsrq,jf,jfjc,htje,zc,htdk,htdsk,htykp,htdkp,rwbh,rwname,
+        cpxh,jd,yzbm,rwyingsk,rwyisk,fptypeone,fpjeone,ykpeone,fptypetwo,fpjetwo,ykpetwo,htzgbm,ywy,htlxqk,
+        htztsm,skdh,zxzt,fkfmc,yhjc,httype,xh,sl,bm,skzje,rwskje,dkhpdqrq,sktype,skkmdm,pzh,ywbm,lrr,lrrq,jylsh,jyid,
+        hph,hpid,skdw,sjly
+        from com_contract_info_exchange_new as a where a.sjly = 20
+        and a.qsrq <![CDATA[ >= ]]> #{beginDate}
+        and a.qsrq &lt; #{endDate}
+        and a.rwbh in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+    </select>
+
+    <select id="getIncomeDetailByTasknoListAndByQsrqRangeIfBossNew1" resultType="org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewHTEVO">
+        select id,serialno,htid,zhtbh,htbh,htname,qsrq,jf,jfjc,htje,zc,htdk,htdsk,htykp,htdkp,rwbh,rwname,
+               cpxh,jd,yzbm,rwyingsk,rwyisk,fptypeone,fpjeone,ykpeone,fptypetwo,fpjetwo,ykpetwo,htzgbm,ywy,htlxqk,
+               htztsm,skdh,zxzt,fkfmc,yhjc,httype,xh,sl,bm,skzje,rwskje,dkhpdqrq,sktype,skkmdm,pzh,ywbm,lrr,lrrq,jylsh,jyid,
+               hph,hpid,skdw,sjly
+        from com_contract_info_exchange_new as a where a.sjly = 20
+                                                   and a.qsrq <![CDATA[ >= ]]> #{beginDate}
+                                                   and a.qsrq &lt; #{endDate}
+    </select>
+
+    <select id="getReceivedDetailByTasknoListAndByQsrqRangeNew1" resultType="org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewYSKVO">
+        select * from com_contract_info_exchange_new as a where sjly = 40
+        and a.dkhpdqrq <![CDATA[ >= ]]> #{beginDate}
+        and a.dkhpdqrq &lt; #{endDate}
+        and a.rwbh in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+    </select>
+
+    <select id="getReceivedDetailByTasknoListAndByQsrqRangeIfBossNew1" resultType="org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewYSKVO">
+        select * from com_contract_info_exchange_new as a where sjly = 40
+                                                            and a.dkhpdqrq  <![CDATA[ >= ]]> #{beginDate}
+                                                            and a.dkhpdqrq &lt; #{endDate}
+    </select>
+
+    <select id="getXdbmHteDetail" resultType="org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewHTEVO">
+        SELECT id,serialno,htid,zhtbh,htbh,htname,qsrq,jf,jfjc,htje,zc,htdk,htdsk,htykp,htdkp,rwbh,rwname,
+        cpxh,jd,yzbm,rwyingsk,rwyisk,fptypeone,fpjeone,ykpeone,fptypetwo,fpjetwo,ykpetwo,htzgbm,ywy,htlxqk,
+        htztsm,skdh,zxzt,fkfmc,yhjc,httype,xh,sl,bm,skzje,rwskje,dkhpdqrq,sktype,skkmdm,pzh,ywbm,lrr,lrrq,jylsh,jyid,
+        hph,hpid,skdw,sjly
+        FROM
+        com_contract_info_exchange_new c
+        INNER JOIN
+        (
+        SELECT taskno, jycs FROM ky_task_info_new WHERE jycs = #{departName}
+        ) k ON c.rwbh = k.taskno
+        WHERE
+        c.sjly = '20'
+        AND qsrq LIKE CONCAT(#{selectDate},'%')
+        GROUP BY
+        k.jycs
+    </select>
+
+    <select id="getXdbmYskDetail" resultType="org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewYSKVO">
+        SELECT *
+        FROM
+        com_contract_info_exchange_new c
+        INNER JOIN
+        (
+        SELECT taskno, jycs FROM ky_task_info_new WHERE jycs = #{departName}
+        ) k ON c.rwbh = k.taskno
+        WHERE
+        c.sjly = '40'
+        AND dkhpdqrq LIKE  CONCAT(#{selectDate},'%')
+        GROUP BY
+        k.jycs
+    </select>
+
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/projectChbGlf/mapper/KzksProjectChbGlfMapper.java

@@ -1,11 +1,16 @@
 package org.jeecg.modules.projectChbGlf.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.v3.oas.annotations.Parameter;
 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.projectChbGlf.entity.ProjectChbGlf;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -25,4 +30,12 @@ public interface KzksProjectChbGlfMapper extends BaseMapper<ProjectChbGlf> {
 
     @Select("select * from kzks_project_chb_glf where taskno = #{taskno}")
     List<ProjectChbGlf> getGLFDetailList(String taskno);
+
+    List<ProjectChbGlf> getDetail(Page<ProjectChbGlf> page,@Param("tasknoList") ArrayList<String> tasknoList,@Param("nowMonth") String nowMonth);
+
+    List<ProjectChbGlf> getDetailIfBoss(Page<ProjectChbGlf> page,@Param("nowMonth") String nowMonth);
+
+    List<ProjectChbZyfExpoet> getDetail1(@Param("tasknoList") ArrayList<String> tasknoList, @Param("nowMonth") String nowMonth);
+
+    List<ProjectChbZyfExpoet> getDetailIfBoss1(@Param("nowMonth") String nowMonth);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbGlf/mapper/xml/KzksProjectChbGlfMapper.xml

@@ -2,4 +2,29 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.projectChbGlf.mapper.KzksProjectChbGlfMapper">
 
+    <select id="getDetail" resultType="org.jeecg.modules.projectChbGlf.entity.ProjectChbGlf">
+        SELECT * FROM kzks_project_chb_glf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        and DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
+    <select id="getDetailIfBoss" resultType="org.jeecg.modules.projectChbGlf.entity.ProjectChbGlf">
+        SELECT * FROM kzks_project_chb_glf
+        where DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
+
+    <select id="getDetail1" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet">
+        SELECT * FROM kzks_project_chb_glf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        and DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
+    <select id="getDetailIfBoss1" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet">
+        SELECT * FROM kzks_project_chb_glf
+        where DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/projectChbRdf/mapper/KzksProjectChbRdfMapper.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.projectChbRdf.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -7,7 +8,9 @@ import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.projectChbRdf.entity.ProjectChbRdf;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.projectChbSwf.entity.ProjectChbSwf;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -27,4 +30,12 @@ public interface KzksProjectChbRdfMapper extends BaseMapper<ProjectChbRdf> {
 
     @Select("select * from kzks_project_chb_rdf where taskno = #{taskno}")
     List<ProjectChbRdf> getRdfDetailList(String taskno);
+
+    List<ProjectChbRdf> getDetail(Page<ProjectChbRdf> page,@Param("tasknoList") ArrayList<String> tasknoList,@Param("nowMonth") String nowMonth);
+
+    List<ProjectChbRdf> getDetailIfBoss(Page<ProjectChbRdf> page,@Param("nowMonth") String nowMonth);
+
+    List<ProjectChbZyfExpoet> getDetail1(@Param("tasknoList") ArrayList<String> tasknoList, @Param("nowMonth") String nowMonth);
+
+    List<ProjectChbZyfExpoet> getDetailIfBoss1(@Param("nowMonth") String nowMonth);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbRdf/mapper/xml/KzksProjectChbRdfMapper.xml

@@ -2,4 +2,29 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.projectChbRdf.mapper.KzksProjectChbRdfMapper">
 
+    <select id="getDetail" resultType="org.jeecg.modules.projectChbRdf.entity.ProjectChbRdf">
+        SELECT * FROM kzks_project_chb_rdf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        and DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
+    <select id="getDetailIfBoss" resultType="org.jeecg.modules.projectChbRdf.entity.ProjectChbRdf">
+        SELECT * FROM kzks_project_chb_rdf
+        where DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
+
+    <select id="getDetail1" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet">
+        SELECT * FROM kzks_project_chb_rdf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        and DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
+    <select id="getDetailIfBoss1" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet">
+        SELECT * FROM kzks_project_chb_rdf
+        where DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/projectChbRgf/mapper/KzksProjectChbRgfMapper.java

@@ -1,11 +1,16 @@
 package org.jeecg.modules.projectChbRgf.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.projectChbRgf.entity.ProjectChbRgf;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
+import org.springframework.web.bind.annotation.PathVariable;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -25,4 +30,12 @@ public interface KzksProjectChbRgfMapper extends BaseMapper<ProjectChbRgf> {
 
     @Select("select * from kzks_project_chb_rgf where taskno = #{taskno}")
     List<ProjectChbRgf> getRGFDetailList(String taskno);
+
+    List<ProjectChbRgf> getDetail(Page<ProjectChbRgf> page,@Param("tasknoList") ArrayList<String> tasknoList,@Param("nowMonth") String nowMonth);
+
+    List<ProjectChbRgf> getDetailIfBoss(Page<ProjectChbRgf> page,@Param("nowMonth") String nowMonth);
+
+    List<ProjectChbZyfExpoet> getDetail1(@Param("tasknoList") ArrayList<String> tasknoList, @Param("nowMonth") String nowMonth);
+
+    List<ProjectChbZyfExpoet> getDetailIfBoss1(@Param("nowMonth") String nowMonth);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbRgf/mapper/xml/KzksProjectChbRgfMapper.xml

@@ -2,4 +2,29 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.projectChbRgf.mapper.KzksProjectChbRgfMapper">
 
+    <select id="getDetail" resultType="org.jeecg.modules.projectChbRgf.entity.ProjectChbRgf">
+        SELECT * FROM kzks_project_chb_rgf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        and DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
+    <select id="getDetailIfBoss" resultType="org.jeecg.modules.projectChbRgf.entity.ProjectChbRgf">
+        SELECT * FROM kzks_project_chb_rgf
+        where DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
+
+    <select id="getDetail1" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet">
+        SELECT * FROM kzks_project_chb_rgf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        and DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
+    <select id="getDetailIfBoss1" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet">
+        SELECT * FROM kzks_project_chb_rgf
+        where DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
 </mapper>

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

@@ -1,11 +1,14 @@
 package org.jeecg.modules.projectChbSwf.mapper;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.projectChbSwf.entity.ProjectChbSwf;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
 
 /**
  * @Description: 事务费
@@ -42,4 +45,12 @@ public interface ProjectChbSwfMapper extends BaseMapper<ProjectChbSwf> {
     *   date: 2024/1/4
     */
     int deleteSwfByNd(@Param("nd") String nd);
+
+    List<ProjectChbSwf> getDetail(Page<ProjectChbSwf> page,@Param("tasknoList") ArrayList<String> tasknoList,@Param("nowMonth") String nowMonth);
+
+    List<ProjectChbSwf> getDetailIfBoss(Page<ProjectChbSwf> page,@Param("nowMonth") String nowMonth);
+
+    List<ProjectChbZyfExpoet> getDetail1(@Param("tasknoList") ArrayList<String> tasknoList, @Param("nowMonth") String nowMonth);
+
+    List<ProjectChbZyfExpoet> getDetailIfBoss1(@Param("nowMonth") String nowMonth);
 }

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

@@ -23,4 +23,30 @@
     <delete id="deleteSwfByNd">
         DELETE FROM kzks_project_chb_swf WHERE nd = #{nd}
     </delete>
+
+    <select id="getDetail" resultType="org.jeecg.modules.projectChbSwf.entity.ProjectChbSwf">
+        SELECT * FROM kzks_project_chb_swf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        and DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
+    <select id="getDetailIfBoss" resultType="org.jeecg.modules.projectChbSwf.entity.ProjectChbSwf">
+        SELECT * FROM kzks_project_chb_swf
+        where DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
+
+    <select id="getDetail1" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet">
+        SELECT * FROM kzks_project_chb_swf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        and DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
+    <select id="getDetailIfBoss1" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet">
+        SELECT * FROM kzks_project_chb_swf
+        where DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/projectChbSxf/mapper/ProjectChbSxfMapper.java

@@ -1,13 +1,16 @@
 package org.jeecg.modules.projectChbSxf.mapper;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
 
 /**
  * @Description: kzks_project_chb_sxf
@@ -26,4 +29,12 @@ public interface ProjectChbSxfMapper extends BaseMapper<ProjectChbSxf> {
 
     @Select("select * from kzks_project_chb_sxf where taskno = #{taskno}")
     List<ProjectChbSxf> getSXFDetailList(String taskno);
+
+    List<ProjectChbSxf> getDetail(Page<ProjectChbSxf> page,@Param("tasknoList") ArrayList<String> tasknoList,@Param("nowMonth") String nowMonth);
+
+    List<ProjectChbSxf> getDetailIfBoss(Page<ProjectChbSxf> page,@Param("nowMonth") String nowMonth);
+
+    List<ProjectChbZyfExpoet> getDetail1(@Param("tasknoList") ArrayList<String> tasknoList, @Param("nowMonth") String nowMonth);
+
+    List<ProjectChbZyfExpoet> getDetailIfBoss1(@Param("nowMonth") String nowMonth);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbSxf/mapper/xml/ProjectChbSxfMapper.xml

@@ -2,4 +2,29 @@
 <!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">
 
+    <select id="getDetail" resultType="org.jeecg.modules.projectChbSxf.entity.ProjectChbSxf">
+        SELECT * FROM kzks_project_chb_sxf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        and DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
+    <select id="getDetailIfBoss" resultType="org.jeecg.modules.projectChbSxf.entity.ProjectChbSxf">
+        SELECT * FROM kzks_project_chb_sxf
+        where DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
+
+    <select id="getDetail1" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet">
+        SELECT * FROM kzks_project_chb_sxf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        and DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
+    <select id="getDetailIfBoss1" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet">
+        SELECT * FROM kzks_project_chb_sxf
+        where DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
 </mapper>

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

@@ -1,11 +1,14 @@
 package org.jeecg.modules.projectChbWxf.mapper;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.projectChbWxf.entity.ProjectChbWxf;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
 
 /**
  * @Description: 外协费
@@ -44,4 +47,12 @@ public interface ProjectChbWxfMapper extends BaseMapper<ProjectChbWxf> {
      *   date: 2024/1/4
      */
     int deleteWxfByNd(@Param("nd") String nd);
+
+    List<ProjectChbWxf> getDetail(Page<ProjectChbWxf> page,@Param("tasknoList") ArrayList<String> tasknoList,@Param("nowMonth") String nowMonth);
+
+    List<ProjectChbWxf> getDetailIfBoss(Page<ProjectChbWxf> page,@Param("nowMonth") String nowMonth);
+
+    List<ProjectChbZyfExpoet> getDetail1(@Param("tasknoList") ArrayList<String> tasknoList, @Param("nowMonth") String nowMonth);
+
+    List<ProjectChbZyfExpoet> getDetailIfBoss1(@Param("nowMonth") String nowMonth);
 }

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

@@ -24,4 +24,30 @@
     <delete id="deleteWxfByNd">
         DELETE FROM kzks_project_chb_wxf WHERE nd = #{nd}
     </delete>
+
+    <select id="getDetail" resultType="org.jeecg.modules.projectChbWxf.entity.ProjectChbWxf">
+        SELECT * FROM kzks_project_chb_wxf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        and DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
+    <select id="getDetailIfBoss" resultType="org.jeecg.modules.projectChbWxf.entity.ProjectChbWxf">
+        SELECT * FROM kzks_project_chb_wxf
+        where DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
+
+    <select id="getDetail1" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet">
+        SELECT * FROM kzks_project_chb_wxf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        and DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
+    <select id="getDetailIfBoss1" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet">
+        SELECT * FROM kzks_project_chb_wxf
+        where DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/projectChbZjf/mapper/KzksProjectChbZjfMapper.java

@@ -1,11 +1,15 @@
 package org.jeecg.modules.projectChbZjf.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.projectChbZjf.entity.ProjectChbZjf;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -25,4 +29,12 @@ public interface KzksProjectChbZjfMapper extends BaseMapper<ProjectChbZjf> {
 
     @Select("select * from kzks_project_chb_zjf where taskno = #{taskno}")
     List<ProjectChbZjf> getZJFDetailList(String taskno);
+
+    List<ProjectChbZjf> getDetail(Page<ProjectChbZjf> page,@Param("tasknoList") ArrayList<String> tasknoList,@Param("nowMonth") String nowMonth);
+
+    List<ProjectChbZjf> getDetailIfBoss(Page<ProjectChbZjf> page,@Param("nowMonth") String nowMonth);
+
+    List<ProjectChbZyfExpoet> getDetail1(@Param("tasknoList") ArrayList<String> tasknoList, @Param("nowMonth") String nowMonth);
+
+    List<ProjectChbZyfExpoet> getDetailIfBoss1(@Param("nowMonth") String nowMonth);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbZjf/mapper/xml/KzksProjectChbZjfMapper.xml

@@ -2,4 +2,29 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.projectChbZjf.mapper.KzksProjectChbZjfMapper">
 
+    <select id="getDetail" resultType="org.jeecg.modules.projectChbZjf.entity.ProjectChbZjf">
+        SELECT * FROM kzks_project_chb_zjf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        and DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
+    <select id="getDetailIfBoss" resultType="org.jeecg.modules.projectChbZjf.entity.ProjectChbZjf">
+        SELECT * FROM kzks_project_chb_zjf
+        where DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
+
+    <select id="getDetail1" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet">
+        SELECT * FROM kzks_project_chb_zjf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        and DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
+    <select id="getDetailIfBoss1" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet">
+        SELECT * FROM kzks_project_chb_zjf
+        where DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
 </mapper>

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

@@ -0,0 +1,144 @@
+package org.jeecg.modules.projectChbZyf.entity;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.HeadFontStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @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="专用费")
+// 头字体设置成20
+@HeadFontStyle(fontHeightInPoints = 10)
+// 行高
+@HeadRowHeight(20)
+// 列宽
+@ColumnWidth(20)
+public class ProjectChbZyfExpoet implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ExcelIgnore
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**创建人*/
+    @ExcelIgnore
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建日期*/
+    @ExcelIgnore
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+	/**更新人*/
+    @ExcelIgnore
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新日期*/
+    @ExcelIgnore
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+	/**所属部门*/
+    @ExcelIgnore
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+	/**年度*/
+	@ExcelProperty(value = "年度")
+    @ApiModelProperty(value = "年度")
+    private String nd;
+	/**凭证日期*/
+	@ExcelProperty(value = "凭证日期")
+    @ApiModelProperty(value = "凭证日期")
+    private String pzrq;
+	/**凭证号*/
+	@ExcelProperty(value = "凭证号")
+    @ApiModelProperty(value = "凭证号")
+    private String pzh;
+	/**摘要*/
+	@ExcelProperty(value = "摘要")
+    @ApiModelProperty(value = "摘要")
+    private String zy;
+	/**科目编号*/
+	@ExcelProperty(value = "科目编号")
+    @ApiModelProperty(value = "科目编号")
+    private String kmbh;
+	/**科目名称*/
+	@ExcelProperty(value = "科目名称")
+    @ApiModelProperty(value = "科目名称")
+    private String km;
+	/**方向*/
+	@ExcelProperty(value = "方向")
+    @ApiModelProperty(value = "方向")
+    private String fx;
+	/**金额*/
+	@ExcelProperty(value = "金额")
+    @ApiModelProperty(value = "金额")
+    private String je;
+	/**部门*/
+	@ExcelProperty(value = "部门")
+    @ApiModelProperty(value = "部门")
+    private String bm;
+	/**往来单位*/
+	@ExcelProperty(value = "往来单位")
+    @ApiModelProperty(value = "往来单位")
+    private String wldw;
+	/**辅助金额*/
+	@ExcelProperty(value = "辅助金额")
+    @ApiModelProperty(value = "辅助金额")
+    private String fzje;
+	/**制单人*/
+	@ExcelProperty(value = "制单人")
+    @ApiModelProperty(value = "制单人")
+    private String zdr;
+	/**会计期间*/
+	@ExcelProperty(value = "会计期间")
+    @ApiModelProperty(value = "会计期间")
+    private String kjqj;
+	/**凭证内码*/
+	@ExcelProperty(value = "凭证内码")
+    @ApiModelProperty(value = "凭证内码")
+    private String pznm;
+	/**项目编号*/
+	@ExcelProperty(value = "项目编号")
+    @ApiModelProperty(value = "项目编号")
+    private String xmbh;
+	/**项目名称*/
+	@ExcelProperty(value = "项目名称")
+    @ApiModelProperty(value = "项目名称")
+    private String xmmc;
+	/**项目类别*/
+	@ExcelProperty(value = "项目类别")
+    @ApiModelProperty(value = "项目类别")
+    private String xmlb;
+	/**任务号*/
+	@ExcelProperty(value = "任务号")
+    @ApiModelProperty(value = "任务号")
+    private String taskno;
+}

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

@@ -1,12 +1,15 @@
 package org.jeecg.modules.projectChbZyf.mapper;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.projectChbWxf.entity.ProjectChbWxf;
 import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyf;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
 
 /**
  * @Description: 专用费
@@ -44,4 +47,12 @@ public interface ProjectChbZyfMapper extends BaseMapper<ProjectChbZyf> {
      *   date: 2024/1/4
      */
     int deleteZyfByNd(@Param("nd") String nd);
+
+    List<ProjectChbZyf> getDetail(Page<ProjectChbZyf> page,@Param("tasknoList") ArrayList<String> tasknoList,@Param("nowMonth") String nowMonth);
+
+    List<ProjectChbZyf> getDetailIfBoss(Page<ProjectChbZyf> page,@Param("nowMonth") String nowMonth);
+
+    List<ProjectChbZyfExpoet> getDetail1(@Param("tasknoList") ArrayList<String> tasknoList, @Param("nowMonth") String nowMonth);
+
+    List<ProjectChbZyfExpoet> getDetailIfBoss1(@Param("nowMonth") String nowMonth);
 }

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

@@ -24,4 +24,30 @@
     <delete id="deleteZyfByNd">
         DELETE FROM kzks_project_chb_zyf WHERE nd = #{nd}
     </delete>
+
+    <select id="getDetail" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyf">
+        SELECT * FROM kzks_project_chb_zyf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        and DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
+    <select id="getDetailIfBoss" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyf">
+        SELECT * FROM kzks_project_chb_zyf
+        where DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
+
+    <select id="getDetail1" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet">
+        SELECT * FROM kzks_project_chb_zyf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        and DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
+    <select id="getDetailIfBoss1" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet">
+        SELECT * FROM kzks_project_chb_zyf
+        where DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
+    </select>
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrderBNew/entity/WzOutboundOrderBNewExport.java

@@ -0,0 +1,311 @@
+package org.jeecg.modules.wzOutboundOrderBNew.entity;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.*;
+import com.alibaba.excel.converters.bigdecimal.BigDecimalNumberConverter;
+import com.alibaba.excel.converters.bigdecimal.BigDecimalStringConverter;
+import com.alibaba.excel.converters.date.DateStringConverter;
+import com.alibaba.excel.enums.poi.FillPatternTypeEnum;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.apache.poi.ss.usermodel.FillPatternType;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Description: wz_outbound_order_b_new
+ * @Author: jeecg-boot
+ * @Date:   2024-03-25
+ * @Version: V1.0
+ */
+@Data
+@TableName("wz_outbound_order_b_new")
+@Accessors(chain = false)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="wz_outbound_order_b_new对象", description="wz_outbound_order_b_new")
+// 头字体设置成20
+@HeadFontStyle(fontHeightInPoints = 10)
+// 行高
+@HeadRowHeight(20)
+// 列宽
+@ColumnWidth(20)
+public class WzOutboundOrderBNewExport implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ExcelIgnore
+    @ApiModelProperty(value = "id")
+    private String id;
+	/**来源(日期)*/
+    @ExcelIgnore
+    @ApiModelProperty(value = "来源(日期)")
+    private String ly;
+	/**库存组织*/
+	@ExcelProperty(value = "库存组织")
+    @ApiModelProperty(value = "库存组织")
+    private String kczz;
+	/**仓库*/
+	@ExcelProperty(value = "仓库")
+    @ApiModelProperty(value = "仓库")
+    private String ck;
+	/**制单人*/
+	@ExcelProperty(value = "制单人")
+    @ApiModelProperty(value = "制单人")
+    private String zdr;
+	/**制单日期*/
+	@ExcelProperty(value = "制单日期")
+    @ApiModelProperty(value = "制单日期")
+    private String zdrq;
+	/**出库单号*/
+	@ExcelProperty(value = "出库单号")
+    @ApiModelProperty(value = "出库单号")
+    private String ckdh;
+	/**行号*/
+	@ExcelProperty(value = "行号")
+    @ApiModelProperty(value = "行号")
+    private String hh;
+	/**出库类型*/
+	@ExcelProperty(value = "出库类型")
+    @ApiModelProperty(value = "出库类型")
+    private String cklx;
+	/**原图纸编码*/
+	@ExcelProperty(value = "原图纸编码")
+    @ApiModelProperty(value = "原图纸编码")
+    private String ytzbm;
+	/**原图纸规格*/
+	@ExcelProperty(value = "原图纸规格")
+    @ApiModelProperty(value = "原图纸规格")
+    private String ytzgg;
+	/**物料分类*/
+	@ExcelProperty(value = "物料分类")
+    @ApiModelProperty(value = "物料分类")
+    private String wlfl;
+	/**物料编码*/
+	@ExcelProperty(value = "物料编码")
+    @ApiModelProperty(value = "物料编码")
+    private String wlbm;
+	/**是否积压物资*/
+	@ExcelProperty(value = "是否积压物资")
+    @ApiModelProperty(value = "是否积压物资")
+    private String sfjywz;
+	/**国产/进口*/
+	@ExcelProperty(value = "国产/进口")
+    @ApiModelProperty(value = "国产/进口")
+    private String gcjk;
+	/**物资名称*/
+	@ExcelProperty(value = "物资名称")
+    @ApiModelProperty(value = "物资名称")
+    private String wzmc;
+	/**规格型号*/
+	@ExcelProperty(value = "规格型号")
+    @ApiModelProperty(value = "规格型号")
+    private String ggxh;
+	/**外观标识*/
+	@ExcelProperty(value = "外观标识")
+    @ApiModelProperty(value = "外观标识")
+    private String wgbs;
+	/**供应商批次号*/
+	@ExcelProperty(value = "供应商批次号")
+    @ApiModelProperty(value = "供应商批次号")
+    private String gyspch;
+	/**质量等级*/
+	@ExcelProperty(value = "质量等级")
+    @ApiModelProperty(value = "质量等级")
+    private String zldj;
+	/**封装形式*/
+	@ExcelProperty(value = "封装形式")
+    @ApiModelProperty(value = "封装形式")
+    private String fzxs;
+	/**生产厂商*/
+	@ExcelProperty(value = "生产厂商")
+    @ApiModelProperty(value = "生产厂商")
+    private String sccs;
+	/**应发数量*/
+	@ExcelProperty(value = "应发数量",converter = BigDecimalNumberConverter.class)
+    @ApiModelProperty(value = "应发数量")
+    private BigDecimal yfsl;
+	/**实发数量*/
+	@ExcelProperty(value = "实发数量",converter = BigDecimalNumberConverter.class)
+    @ApiModelProperty(value = "实发数量")
+    private BigDecimal sfsl;
+	/**质保有效期*/
+//	@Excel(value = "质保有效期", format = "yyyy-MM-dd HH:mm:ss")
+    @ExcelProperty(value = "质保有效期", converter = DateStringConverter.class)
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "质保有效期")
+    private Date zbyxq;
+	/**质保单位*/
+	@ExcelProperty(value = "质保单位")
+    @ApiModelProperty(value = "质保单位")
+    private String zbdw;
+	/**质保依据*/
+	@ExcelProperty(value = "质保依据")
+    @ApiModelProperty(value = "质保依据")
+    private String zbyj;
+	/**配套指令号*/
+	@ExcelProperty(value = "配套指令号")
+    @ApiModelProperty(value = "配套指令号")
+    private String ptzlh;
+	/**投产任务号*/
+	@ExcelProperty(value = "投产任务号")
+    @ApiModelProperty(value = "投产任务号")
+    private String tcrwh;
+	/**研制阶段*/
+	@ExcelProperty(value = "研制阶段")
+    @ApiModelProperty(value = "研制阶段")
+    private String yzjd;
+	/**设备名称*/
+	@ExcelProperty(value = "设备名称")
+    @ApiModelProperty(value = "设备名称")
+    private String sbmc;
+	/**单板号*/
+	@ExcelProperty(value = "单板号")
+    @ApiModelProperty(value = "单板号")
+    private String dbh;
+	/**合格证号*/
+	@ExcelProperty(value = "合格证号")
+    @ApiModelProperty(value = "合格证号")
+    private String hgzh;
+	/**合格证是否已上传*/
+	@ExcelProperty(value = "合格证是否已上传")
+    @ApiModelProperty(value = "合格证是否已上传")
+    private String hgzysc;
+	/**DPA号*/
+	@ExcelProperty(value = "DPA号")
+    @ApiModelProperty(value = "DPA号")
+    private String dpah;
+	/**领用单位*/
+	@ExcelProperty(value = "领用单位")
+    @ApiModelProperty(value = "领用单位")
+    private String lydw;
+	/**领用人*/
+	@ExcelProperty(value = "领用人")
+    @ApiModelProperty(value = "领用人")
+    private String lyr;
+	/**仓库名称*/
+	@ExcelProperty(value = "仓库名称")
+    @ApiModelProperty(value = "仓库名称")
+    private String ckmc;
+	/**单据状态*/
+	@ExcelProperty(value = "单据状态")
+    @ApiModelProperty(value = "单据状态")
+    private String djztone;
+	/**单位*/
+	@ExcelProperty(value = "单位")
+    @ApiModelProperty(value = "单位")
+    private String dw;
+	/**内转移价*/
+	@ExcelProperty(value = "内转移价")
+    @ApiModelProperty(value = "内转移价")
+    private String nzyj;
+	/**单价*/
+	@ExcelProperty(value = "单价",converter = BigDecimalStringConverter.class)
+    @ApiModelProperty(value = "单价")
+    private BigDecimal nbdj;
+	/**采购单价*/
+	@ExcelProperty(value = "采购单价",converter = BigDecimalStringConverter.class)
+    @ApiModelProperty(value = "采购单价")
+    private BigDecimal cgdj;
+	/**金额*/
+	@ExcelProperty(value = "金额",converter = BigDecimalNumberConverter.class)
+    @ApiModelProperty(value = "金额")
+    private BigDecimal je;
+	/**储位号*/
+	@ExcelProperty(value = "储位号")
+    @ApiModelProperty(value = "储位号")
+    private String cwh;
+	/**当前保管员*/
+	@ExcelProperty(value = "当前保管员")
+    @ApiModelProperty(value = "当前保管员")
+    private String dqbgy;
+	/**出库状态*/
+	@ExcelProperty(value = "出库状态")
+    @ApiModelProperty(value = "出库状态")
+    private String ckzt;
+	/**单据状态*/
+	@ExcelProperty(value = "单据状态")
+    @ApiModelProperty(value = "单据状态")
+    private String djzttwo;
+	/**配套单号*/
+	@ExcelProperty(value = "配套单号")
+    @ApiModelProperty(value = "配套单号")
+    private String ptdh;
+	/**备料计划单号*/
+	@ExcelProperty(value = "备料计划单号")
+    @ApiModelProperty(value = "备料计划单号")
+    private String bljhdh;
+	/**批次号*/
+	@ExcelProperty(value = "批次号")
+    @ApiModelProperty(value = "批次号")
+    private String pch;
+	/**首次入库时间*/
+//	@Excel(value = "首次入库时间", format = "yyyy-MM-dd")
+    @ExcelProperty(value = "首次入库时间", converter = DateStringConverter.class)
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "首次入库时间")
+    private Date scrksj;
+	/**任务号*/
+	@ExcelProperty(value = "任务号")
+    @ApiModelProperty(value = "任务号")
+    private String rwh;
+	/**型号分类*/
+	@ExcelProperty(value = "型号分类")
+    @ApiModelProperty(value = "型号分类")
+    private String xhfl;
+	/**军品管理员*/
+	@ExcelProperty(value = "军品管理员")
+    @ApiModelProperty(value = "军品管理员")
+    private String jpgly;
+	/**民品管理员*/
+	@ExcelProperty(value = "民品管理员")
+    @ApiModelProperty(value = "民品管理员")
+    private String mpgly;
+	/**箱号*/
+	@ExcelProperty(value = "箱号")
+    @ApiModelProperty(value = "箱号")
+    private String xh;
+	/**智能仓储标识*/
+	@ExcelProperty(value = "智能仓储标识")
+    @ApiModelProperty(value = "智能仓储标识")
+    private String znccbs;
+	/**打印次数*/
+	@ExcelProperty(value = "打印次数")
+    @ApiModelProperty(value = "打印次数")
+    private String dycs;
+	/**A*/
+	@ExcelProperty(value = "A")
+    @ApiModelProperty(value = "A")
+    private String a;
+	/**优先级*/
+    @ExcelProperty(value = "优先级")
+    @ApiModelProperty(value = "优先级")
+    private String yxj;
+	/**年*/
+	@ExcelIgnore
+    @ApiModelProperty(value = "年")
+    private Integer year;
+	/**月*/
+    @ExcelIgnore
+    @ApiModelProperty(value = "月")
+    private Integer month;
+	/**年月*/
+    @ExcelIgnore
+    @ApiModelProperty(value = "年月")
+    private String yearmonth;
+}

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrderBNew/mapper/WzOutboundOrderBNewMapper.java

@@ -1,13 +1,18 @@
 package org.jeecg.modules.wzOutboundOrderBNew.mapper;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyf;
 import org.jeecg.modules.wzOutboundOrder.entity.CLfCompareDO;
 import org.jeecg.modules.wzOutboundOrder.vo.WzOutboundOrderBDetailListVO;
 import org.jeecg.modules.wzOutboundOrderBNew.entity.WzOutboundOrderBNew;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.wzOutboundOrderBNew.entity.WzOutboundOrderBNewExport;
 
 /**
  * @Description: wz_outbound_order_b_new
@@ -31,4 +36,12 @@ public interface WzOutboundOrderBNewMapper extends BaseMapper<WzOutboundOrderBNe
     List<CLfCompareDO> getCLFCompareDoListByTaskNoList(@Param("taskno") String taskno);
 
     List<CLfCompareDO> getCLFCompareDoListByTaskNoListHasPcCode(@Param("taskno") String taskno,@Param("hasPcCode") Boolean hasPcCode,@Param("proportion") Double proportion);
+
+    List<WzOutboundOrderBNew> getClfDetailIfBoss(Page<WzOutboundOrderBNew> page,@Param("nowMonth") String nowMonth);
+
+    List<WzOutboundOrderBNew> getClfDetail(Page<WzOutboundOrderBNew> page,@Param("tasknoList") ArrayList<String> tasknoList,@Param("nowMonth") String nowMonth);
+
+    List<WzOutboundOrderBNewExport> getClfDetailIfBoss1(@Param("nowMonth") String nowMonth);
+
+    List<WzOutboundOrderBNewExport> getClfDetail1(@Param("tasknoList") ArrayList<String> tasknoList, @Param("nowMonth") String nowMonth);
 }

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrderBNew/mapper/xml/WzOutboundOrderBNewMapper.xml

@@ -75,4 +75,32 @@
 
 
     </select>
+
+    <select id="getClfDetailIfBoss" resultType="org.jeecg.modules.wzOutboundOrderBNew.entity.WzOutboundOrderBNew">
+        select * from wz_outbound_order_b_new where yearmonth = #{nowMonth}
+    </select>
+
+    <select id="getClfDetail" resultType="org.jeecg.modules.wzOutboundOrderBNew.entity.WzOutboundOrderBNew">
+        select *
+        from wz_outbound_order_b_new
+        where tcrwh in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        and yearmonth = #{nowMonth}
+    </select>
+
+    <select id="getClfDetailIfBoss1" resultType="org.jeecg.modules.wzOutboundOrderBNew.entity.WzOutboundOrderBNewExport">
+        select * from wz_outbound_order_b_new where yearmonth = #{nowMonth}
+    </select>
+
+    <select id="getClfDetail1" resultType="org.jeecg.modules.wzOutboundOrderBNew.entity.WzOutboundOrderBNewExport">
+        select *
+        from wz_outbound_order_b_new
+        where tcrwh in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        and yearmonth = #{nowMonth}
+    </select>
 </mapper>