新增燃动费，管理费，固资费详情与导出

module_kzks/src/main/java/org/jeecg/modules/projectChbGlf/controller/KzksProjectChbGlfController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.projectChbGlf.controller;
 
 import java.util.Arrays;
+import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
@@ -14,6 +15,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.projectChbRdf.entity.ProjectChbRdf;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -22,12 +24,12 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
  /**
- * @Description: kzks_project_chb_glf
+ * @Description: 管理费
  * @Author: jeecg-boot
  * @Date:   2024-01-17
  * @Version: V1.0
  */
-@Api(tags="kzks_project_chb_glf")
+@Api(tags="管理费")
 @RestController
 @RequestMapping("/projectChbGlf/kzksProjectChbGlf")
 @Slf4j
@@ -35,7 +37,24 @@ public class KzksProjectChbGlfController extends JeecgController<ProjectChbGlf,
 	@Autowired
 	private IKzksProjectChbGlfService kzksProjectChbGlfService;
 
-	/**
+
+	 @ApiOperation(value="项目成本——导出管理费详情excel")
+	 @RequestMapping(value = "/exportGLFDetail")
+	 public ModelAndView exportSWFDetail(String taskno) {
+		 List<ProjectChbGlf> list = getGLFDetailList(taskno);
+		 return kzksProjectChbGlfService.exportGLFDetail(list,ProjectChbGlf.class, "管理费详情");
+	 }
+
+
+	 /**项目成本——管理费详情——根据任务号查询*/
+	 @ApiOperation("项目成本——管理费详情")
+	 @GetMapping("/getGLFDetailList")
+	 public List<ProjectChbGlf> getGLFDetailList(String taskno){
+		 return kzksProjectChbGlfService.getGLFDetailList(taskno);
+	 }
+
+
+	 /**
 	 * 分页列表查询
 	 *
 	 * @param projectChbGlf
@@ -44,8 +63,8 @@ public class KzksProjectChbGlfController extends JeecgController<ProjectChbGlf,
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "kzks_project_chb_glf-分页列表查询")
-	@ApiOperation(value="kzks_project_chb_glf-分页列表查询", notes="kzks_project_chb_glf-分页列表查询")
+	//@AutoLog(value = "管理费-分页列表查询")
+	@ApiOperation(value="管理费-分页列表查询", notes="管理费-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<ProjectChbGlf>> queryPageList(ProjectChbGlf projectChbGlf,
 													  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -63,9 +82,9 @@ public class KzksProjectChbGlfController extends JeecgController<ProjectChbGlf,
 	 * @param projectChbGlf
 	 * @return
 	 */
-	@AutoLog(value = "kzks_project_chb_glf-添加")
-	@ApiOperation(value="kzks_project_chb_glf-添加", notes="kzks_project_chb_glf-添加")
-	//@RequiresPermissions("org.jeecg.modules:kzks_project_chb_glf:add")
+	@AutoLog(value = "管理费-添加")
+	@ApiOperation(value="管理费-添加", notes="管理费-添加")
+	//@RequiresPermissions("org.jeecg.modules:管理费:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody ProjectChbGlf projectChbGlf) {
 		kzksProjectChbGlfService.save(projectChbGlf);
@@ -78,9 +97,9 @@ public class KzksProjectChbGlfController extends JeecgController<ProjectChbGlf,
 	 * @param projectChbGlf
 	 * @return
 	 */
-	@AutoLog(value = "kzks_project_chb_glf-编辑")
-	@ApiOperation(value="kzks_project_chb_glf-编辑", notes="kzks_project_chb_glf-编辑")
-	//@RequiresPermissions("org.jeecg.modules:kzks_project_chb_glf:edit")
+	@AutoLog(value = "管理费-编辑")
+	@ApiOperation(value="管理费-编辑", notes="管理费-编辑")
+	//@RequiresPermissions("org.jeecg.modules:管理费:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody ProjectChbGlf projectChbGlf) {
 		kzksProjectChbGlfService.updateById(projectChbGlf);
@@ -93,9 +112,9 @@ public class KzksProjectChbGlfController extends JeecgController<ProjectChbGlf,
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "kzks_project_chb_glf-通过id删除")
-	@ApiOperation(value="kzks_project_chb_glf-通过id删除", notes="kzks_project_chb_glf-通过id删除")
-	//@RequiresPermissions("org.jeecg.modules:kzks_project_chb_glf:delete")
+	@AutoLog(value = "管理费-通过id删除")
+	@ApiOperation(value="管理费-通过id删除", notes="管理费-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:管理费:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		kzksProjectChbGlfService.removeById(id);
@@ -108,9 +127,9 @@ public class KzksProjectChbGlfController extends JeecgController<ProjectChbGlf,
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "kzks_project_chb_glf-批量删除")
-	@ApiOperation(value="kzks_project_chb_glf-批量删除", notes="kzks_project_chb_glf-批量删除")
-	//@RequiresPermissions("org.jeecg.modules:kzks_project_chb_glf:deleteBatch")
+	@AutoLog(value = "管理费-批量删除")
+	@ApiOperation(value="管理费-批量删除", notes="管理费-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:管理费:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.kzksProjectChbGlfService.removeByIds(Arrays.asList(ids.split(",")));
@@ -123,8 +142,8 @@ public class KzksProjectChbGlfController extends JeecgController<ProjectChbGlf,
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "kzks_project_chb_glf-通过id查询")
-	@ApiOperation(value="kzks_project_chb_glf-通过id查询", notes="kzks_project_chb_glf-通过id查询")
+	//@AutoLog(value = "管理费-通过id查询")
+	@ApiOperation(value="管理费-通过id查询", notes="管理费-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<ProjectChbGlf> queryById(@RequestParam(name="id",required=true) String id) {
 		ProjectChbGlf projectChbGlf = kzksProjectChbGlfService.getById(id);
@@ -140,10 +159,10 @@ public class KzksProjectChbGlfController extends JeecgController<ProjectChbGlf,
     * @param request
     * @param projectChbGlf
     */
-    //@RequiresPermissions("org.jeecg.modules:kzks_project_chb_glf:exportXls")
+    //@RequiresPermissions("org.jeecg.modules:管理费:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, ProjectChbGlf projectChbGlf) {
-        return super.exportXls(request, projectChbGlf, ProjectChbGlf.class, "kzks_project_chb_glf");
+        return super.exportXls(request, projectChbGlf, ProjectChbGlf.class, "管理费");
     }
 
     /**
@@ -153,7 +172,7 @@ public class KzksProjectChbGlfController extends JeecgController<ProjectChbGlf,
     * @param response
     * @return
     */
-    //@RequiresPermissions("kzks_project_chb_glf:importExcel")
+    //@RequiresPermissions("管理费:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, ProjectChbGlf.class);

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

@@ -6,6 +6,8 @@ import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.projectChbGlf.entity.ProjectChbGlf;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * @Description: kzks_project_chb_glf
  * @Author: jeecg-boot
@@ -20,4 +22,7 @@ public interface KzksProjectChbGlfMapper extends BaseMapper<ProjectChbGlf> {
 
     @Delete("DELETE FROM kzks_project_chb_glf WHERE nd = #{nd}")
     void deleteWxfByNd(String nd);
+
+    @Select("select * from kzks_project_chb_glf where taskno = #{taskno}")
+    List<ProjectChbGlf> getGLFDetailList(String taskno);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbGlf/service/IKzksProjectChbGlfService.java

@@ -2,6 +2,9 @@ package org.jeecg.modules.projectChbGlf.service;
 
 import org.jeecg.modules.projectChbGlf.entity.ProjectChbGlf;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.List;
 
 /**
  * @Description: kzks_project_chb_glf
@@ -14,4 +17,8 @@ public interface IKzksProjectChbGlfService extends IService<ProjectChbGlf> {
     int getIfHaveThisNd(String nd);
 
     void deleteWxfByNd(String nd);
+
+    List<ProjectChbGlf> getGLFDetailList(String taskno);
+
+    ModelAndView exportGLFDetail(List<ProjectChbGlf> exportList, Class<ProjectChbGlf> clazz, String title);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbGlf/service/impl/KzksProjectChbGlfServiceImpl.java

@@ -1,12 +1,21 @@
 package org.jeecg.modules.projectChbGlf.service.impl;
 
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.projectChbGlf.entity.ProjectChbGlf;
 import org.jeecg.modules.projectChbGlf.mapper.KzksProjectChbGlfMapper;
 import org.jeecg.modules.projectChbGlf.service.IKzksProjectChbGlfService;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.List;
 
 /**
  * @Description: kzks_project_chb_glf
@@ -19,6 +28,11 @@ public class KzksProjectChbGlfServiceImpl extends ServiceImpl<KzksProjectChbGlfM
 
     @Autowired
     private KzksProjectChbGlfMapper glfMapper;
+
+
+    @Value("${jeecg.path.upload}")
+    private String upLoadPath;
+
     @Override
     public int getIfHaveThisNd(String nd) {
         return glfMapper.getIfHaveThisNd(nd);
@@ -28,4 +42,28 @@ public class KzksProjectChbGlfServiceImpl extends ServiceImpl<KzksProjectChbGlfM
     public void deleteWxfByNd(String nd) {
         glfMapper.deleteWxfByNd(nd);
     }
+
+    @Override
+    public List<ProjectChbGlf> getGLFDetailList(String taskno) {
+        return glfMapper.getGLFDetailList(taskno);
+    }
+
+    @Override
+    public ModelAndView exportGLFDetail(List<ProjectChbGlf> exportList, Class<ProjectChbGlf> clazz, String title) {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        // Step.3 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        //此处设置的filename无效 ,前端会重更新设置一下
+        mv.addObject(NormalExcelConstants.FILE_NAME, title);
+        mv.addObject(NormalExcelConstants.CLASS, clazz);
+        //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
+//        ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + "admin111", title);
+
+        ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
+        exportParams.setImageBasePath(upLoadPath);
+        //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
+        mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+        mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+        return mv;
+    }
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbRdf/controller/KzksProjectChbRdfController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.projectChbRdf.controller;
 
 import java.util.Arrays;
+import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
@@ -14,6 +15,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.projectChbSwf.entity.ProjectChbSwf;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -35,6 +37,21 @@ public class KzksProjectChbRdfController extends JeecgController<ProjectChbRdf,
 	@Autowired
 	private IKzksProjectChbRdfService kzksProjectChbRdfService;
 
+	 @ApiOperation(value="项目成本——导出燃动费详情excel")
+	 @RequestMapping(value = "/exportRDFDetail")
+	 public ModelAndView exportRDFDetail(String taskno) {
+		 List<ProjectChbRdf> list = getRDFDetailList(taskno);
+		 return kzksProjectChbRdfService.exportRDFDetail(list,ProjectChbRdf.class, "燃动费详情");
+	 }
+
+
+	 /**项目成本——燃动费详情——根据任务号查询*/
+	 @ApiOperation("项目成本——燃动费详情")
+	 @GetMapping("/getRDFDetailList")
+	 public List<ProjectChbRdf> getRDFDetailList(String taskno){
+		 return kzksProjectChbRdfService.getRDFDetailList(taskno);
+	 }
+
 	/**
 	 * 分页列表查询
 	 *

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

@@ -6,6 +6,9 @@ import org.apache.ibatis.annotations.Param;
 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 java.util.List;
 
 /**
  * @Description: kzks_project_chb_rdf
@@ -21,4 +24,7 @@ public interface KzksProjectChbRdfMapper extends BaseMapper<ProjectChbRdf> {
 
     @Delete("DELETE FROM kzks_project_chb_rdf WHERE nd = #{nd}")
     void deleteWxfByNd(String nd);
+
+    @Select("select * from kzks_project_chb_rdf where taskno = #{taskno}")
+    List<ProjectChbRdf> getRdfDetailList(String taskno);
 }

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

@@ -2,4 +2,4 @@
 <!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">
 
-</mapper>
+</mapper>

module_kzks/src/main/java/org/jeecg/modules/projectChbRdf/service/IKzksProjectChbRdfService.java

@@ -2,6 +2,10 @@ package org.jeecg.modules.projectChbRdf.service;
 
 import org.jeecg.modules.projectChbRdf.entity.ProjectChbRdf;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.projectChbSwf.entity.ProjectChbSwf;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.List;
 
 /**
  * @Description: kzks_project_chb_rdf
@@ -14,4 +18,8 @@ public interface IKzksProjectChbRdfService extends IService<ProjectChbRdf> {
     int getIfHaveThisNd(String nd);
 
     void deleteWxfByNd(String nd);
+
+    List<ProjectChbRdf> getRDFDetailList(String taskno);
+
+    ModelAndView exportRDFDetail(List<ProjectChbRdf> exportList, Class<ProjectChbRdf> clazz, String title);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbRdf/service/impl/KzksProjectChbRdfServiceImpl.java

@@ -1,12 +1,22 @@
 package org.jeecg.modules.projectChbRdf.service.impl;
 
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.projectChbRdf.entity.ProjectChbRdf;
 import org.jeecg.modules.projectChbRdf.mapper.KzksProjectChbRdfMapper;
 import org.jeecg.modules.projectChbRdf.service.IKzksProjectChbRdfService;
+import org.jeecg.modules.projectChbSwf.entity.ProjectChbSwf;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.List;
 
 /**
  * @Description: kzks_project_chb_rdf
@@ -20,6 +30,9 @@ public class KzksProjectChbRdfServiceImpl extends ServiceImpl<KzksProjectChbRdfM
     @Autowired
     private KzksProjectChbRdfMapper rdfMapper;
 
+    @Value("${jeecg.path.upload}")
+    private String upLoadPath;
+
     @Override
     public int getIfHaveThisNd(String nd) {
         return rdfMapper.getIfHaveThisNd(nd);
@@ -29,4 +42,28 @@ public class KzksProjectChbRdfServiceImpl extends ServiceImpl<KzksProjectChbRdfM
     public void deleteWxfByNd(String nd) {
         rdfMapper.deleteWxfByNd(nd);
     }
+
+    @Override
+    public List<ProjectChbRdf> getRDFDetailList(String taskno) {
+        return rdfMapper.getRdfDetailList(taskno);
+    }
+
+    @Override
+    public ModelAndView exportRDFDetail(List<ProjectChbRdf> exportList, Class<ProjectChbRdf> clazz, String title) {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        // Step.3 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        //此处设置的filename无效 ,前端会重更新设置一下
+        mv.addObject(NormalExcelConstants.FILE_NAME, title);
+        mv.addObject(NormalExcelConstants.CLASS, clazz);
+        //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
+//        ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + "admin111", title);
+
+        ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
+        exportParams.setImageBasePath(upLoadPath);
+        //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
+        mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+        mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+        return mv;
+    }
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbRgf/controller/KzksProjectChbRgfController.java

@@ -1,10 +1,12 @@
 package org.jeecg.modules.projectChbRgf.controller;
 
 import java.util.Arrays;
+import java.util.List;
 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.modules.projectChbRdf.entity.ProjectChbRdf;
 import org.jeecg.modules.projectChbRgf.entity.ProjectChbRgf;
 import org.jeecg.modules.projectChbRgf.service.IKzksProjectChbRgfService;
 
@@ -22,12 +24,12 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
  /**
- * @Description: kzks_project_chb_rgf
+ * @Description: 人工费
  * @Author: jeecg-boot
  * @Date:   2024-01-17
  * @Version: V1.0
  */
-@Api(tags="kzks_project_chb_rgf")
+@Api(tags="人工费")
 @RestController
 @RequestMapping("/projectChbRgf/kzksProjectChbRgf")
 @Slf4j
@@ -35,6 +37,21 @@ public class KzksProjectChbRgfController extends JeecgController<ProjectChbRgf,
 	@Autowired
 	private IKzksProjectChbRgfService kzksProjectChbRgfService;
 
+	 @ApiOperation(value="项目成本——导出人工费详情excel")
+	 @RequestMapping(value = "/exportRGFDetail")
+	 public ModelAndView exportRGFDetail(String taskno) {
+		 List<ProjectChbRgf> list = getRGFDetailList(taskno);
+		 return kzksProjectChbRgfService.exportRGFDetail(list,ProjectChbRgf.class, "人工费详情");
+	 }
+
+
+	 /**项目成本——人工费详情——根据任务号查询*/
+	 @ApiOperation("项目成本——人工费详情")
+	 @GetMapping("/getRGFDetailList")
+	 public List<ProjectChbRgf> getRGFDetailList(String taskno){
+		 return kzksProjectChbRgfService.getRGFDetailList(taskno);
+	 }
+
 	/**
 	 * 分页列表查询
 	 *
@@ -44,8 +61,8 @@ public class KzksProjectChbRgfController extends JeecgController<ProjectChbRgf,
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "kzks_project_chb_rgf-分页列表查询")
-	@ApiOperation(value="kzks_project_chb_rgf-分页列表查询", notes="kzks_project_chb_rgf-分页列表查询")
+	//@AutoLog(value = "人工费-分页列表查询")
+	@ApiOperation(value="人工费-分页列表查询", notes="人工费-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<ProjectChbRgf>> queryPageList(ProjectChbRgf projectChbRgf,
 													  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -63,9 +80,9 @@ public class KzksProjectChbRgfController extends JeecgController<ProjectChbRgf,
 	 * @param projectChbRgf
 	 * @return
 	 */
-	@AutoLog(value = "kzks_project_chb_rgf-添加")
-	@ApiOperation(value="kzks_project_chb_rgf-添加", notes="kzks_project_chb_rgf-添加")
-	//@RequiresPermissions("org.jeecg.modules:kzks_project_chb_rgf:add")
+	@AutoLog(value = "人工费-添加")
+	@ApiOperation(value="人工费-添加", notes="人工费-添加")
+	//@RequiresPermissions("org.jeecg.modules:人工费:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody ProjectChbRgf projectChbRgf) {
 		kzksProjectChbRgfService.save(projectChbRgf);
@@ -78,9 +95,9 @@ public class KzksProjectChbRgfController extends JeecgController<ProjectChbRgf,
 	 * @param projectChbRgf
 	 * @return
 	 */
-	@AutoLog(value = "kzks_project_chb_rgf-编辑")
-	@ApiOperation(value="kzks_project_chb_rgf-编辑", notes="kzks_project_chb_rgf-编辑")
-	//@RequiresPermissions("org.jeecg.modules:kzks_project_chb_rgf:edit")
+	@AutoLog(value = "人工费-编辑")
+	@ApiOperation(value="人工费-编辑", notes="人工费-编辑")
+	//@RequiresPermissions("org.jeecg.modules:人工费:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody ProjectChbRgf projectChbRgf) {
 		kzksProjectChbRgfService.updateById(projectChbRgf);
@@ -93,9 +110,9 @@ public class KzksProjectChbRgfController extends JeecgController<ProjectChbRgf,
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "kzks_project_chb_rgf-通过id删除")
-	@ApiOperation(value="kzks_project_chb_rgf-通过id删除", notes="kzks_project_chb_rgf-通过id删除")
-	//@RequiresPermissions("org.jeecg.modules:kzks_project_chb_rgf:delete")
+	@AutoLog(value = "人工费-通过id删除")
+	@ApiOperation(value="人工费-通过id删除", notes="人工费-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:人工费:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		kzksProjectChbRgfService.removeById(id);
@@ -108,9 +125,9 @@ public class KzksProjectChbRgfController extends JeecgController<ProjectChbRgf,
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "kzks_project_chb_rgf-批量删除")
-	@ApiOperation(value="kzks_project_chb_rgf-批量删除", notes="kzks_project_chb_rgf-批量删除")
-	//@RequiresPermissions("org.jeecg.modules:kzks_project_chb_rgf:deleteBatch")
+	@AutoLog(value = "人工费-批量删除")
+	@ApiOperation(value="人工费-批量删除", notes="人工费-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:人工费:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.kzksProjectChbRgfService.removeByIds(Arrays.asList(ids.split(",")));
@@ -123,8 +140,8 @@ public class KzksProjectChbRgfController extends JeecgController<ProjectChbRgf,
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "kzks_project_chb_rgf-通过id查询")
-	@ApiOperation(value="kzks_project_chb_rgf-通过id查询", notes="kzks_project_chb_rgf-通过id查询")
+	//@AutoLog(value = "人工费-通过id查询")
+	@ApiOperation(value="人工费-通过id查询", notes="人工费-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<ProjectChbRgf> queryById(@RequestParam(name="id",required=true) String id) {
 		ProjectChbRgf projectChbRgf = kzksProjectChbRgfService.getById(id);
@@ -140,10 +157,10 @@ public class KzksProjectChbRgfController extends JeecgController<ProjectChbRgf,
     * @param request
     * @param projectChbRgf
     */
-    //@RequiresPermissions("org.jeecg.modules:kzks_project_chb_rgf:exportXls")
+    //@RequiresPermissions("org.jeecg.modules:人工费:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, ProjectChbRgf projectChbRgf) {
-        return super.exportXls(request, projectChbRgf, ProjectChbRgf.class, "kzks_project_chb_rgf");
+        return super.exportXls(request, projectChbRgf, ProjectChbRgf.class, "人工费");
     }
 
     /**
@@ -153,7 +170,7 @@ public class KzksProjectChbRgfController extends JeecgController<ProjectChbRgf,
     * @param response
     * @return
     */
-    //@RequiresPermissions("kzks_project_chb_rgf:importExcel")
+    //@RequiresPermissions("人工费:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, ProjectChbRgf.class);

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

@@ -6,6 +6,8 @@ import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.projectChbRgf.entity.ProjectChbRgf;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * @Description: kzks_project_chb_rgf
  * @Author: jeecg-boot
@@ -20,4 +22,7 @@ public interface KzksProjectChbRgfMapper extends BaseMapper<ProjectChbRgf> {
 
     @Delete("DELETE FROM kzks_project_chb_rgf WHERE nd = #{nd}")
     void deleteWxfByNd(String nd);
+
+    @Select("select * from kzks_project_chb_rgf where taskno = #{taskno}")
+    List<ProjectChbRgf> getRGFDetailList(String taskno);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbRgf/service/IKzksProjectChbRgfService.java

@@ -2,6 +2,9 @@ package org.jeecg.modules.projectChbRgf.service;
 
 import org.jeecg.modules.projectChbRgf.entity.ProjectChbRgf;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.List;
 
 /**
  * @Description: kzks_project_chb_rgf
@@ -14,4 +17,8 @@ public interface IKzksProjectChbRgfService extends IService<ProjectChbRgf> {
     int getIfHaveThisNd(String nd);
 
     void deleteWxfByNd(String nd);
+
+    List<ProjectChbRgf> getRGFDetailList(String taskno);
+
+    ModelAndView exportRGFDetail(List<ProjectChbRgf> exportList, Class<ProjectChbRgf> clazz, String title);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbRgf/service/impl/KzksProjectChbRgfServiceImpl.java

@@ -1,12 +1,21 @@
 package org.jeecg.modules.projectChbRgf.service.impl;
 
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.projectChbRgf.entity.ProjectChbRgf;
 import org.jeecg.modules.projectChbRgf.mapper.KzksProjectChbRgfMapper;
 import org.jeecg.modules.projectChbRgf.service.IKzksProjectChbRgfService;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.List;
 
 /**
  * @Description: kzks_project_chb_rgf
@@ -19,6 +28,11 @@ public class KzksProjectChbRgfServiceImpl extends ServiceImpl<KzksProjectChbRgfM
 
     @Autowired
     private KzksProjectChbRgfMapper rgfMapper;
+
+
+    @Value("${jeecg.path.upload}")
+    private String upLoadPath;
+
     @Override
     public int getIfHaveThisNd(String nd) {
         return rgfMapper.getIfHaveThisNd(nd);
@@ -28,4 +42,28 @@ public class KzksProjectChbRgfServiceImpl extends ServiceImpl<KzksProjectChbRgfM
     public void deleteWxfByNd(String nd) {
         rgfMapper.deleteWxfByNd(nd);
     }
+
+    @Override
+    public List<ProjectChbRgf> getRGFDetailList(String taskno) {
+        return rgfMapper.getRGFDetailList(taskno);
+    }
+
+    @Override
+    public ModelAndView exportRGFDetail(List<ProjectChbRgf> exportList, Class<ProjectChbRgf> clazz, String title) {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        // Step.3 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        //此处设置的filename无效 ,前端会重更新设置一下
+        mv.addObject(NormalExcelConstants.FILE_NAME, title);
+        mv.addObject(NormalExcelConstants.CLASS, clazz);
+        //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
+//        ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + "admin111", title);
+
+        ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
+        exportParams.setImageBasePath(upLoadPath);
+        //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
+        mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+        mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+        return mv;
+    }
 }

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

@@ -12,6 +12,7 @@ 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.projectChbGlf.entity.ProjectChbGlf;
 import org.jeecg.modules.projectChbSxf.entity.ProjectChbSxf;
 import org.jeecg.modules.projectChbSxf.service.IProjectChbSxfService;
 
@@ -37,19 +38,36 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
  /**
- * @Description: kzks_project_chb_sxf
+ * @Description: 筛选费
  * @Author: jeecg-boot
  * @Date:   2024-01-19
  * @Version: V1.0
  */
-@Api(tags="kzks_project_chb_sxf")
+@Api(tags="筛选费")
 @RestController
 @RequestMapping("/projectChbSxf/projectChbSxf")
 @Slf4j
 public class ProjectChbSxfController extends JeecgController<ProjectChbSxf, IProjectChbSxfService> {
 	@Autowired
 	private IProjectChbSxfService projectChbSxfService;
-	
+
+
+	 @ApiOperation(value="项目成本——导出筛选费详情excel")
+	 @RequestMapping(value = "/exportSXFDetail")
+	 public ModelAndView exportSXFDetail(String taskno) {
+		 List<ProjectChbSxf> list = getSXFDetailList(taskno);
+		 return projectChbSxfService.exportSXFDetail(list,ProjectChbSxf.class, "筛选费详情");
+	 }
+
+
+	 /**项目成本——管理费详情——根据任务号查询*/
+	 @ApiOperation("项目成本——筛选费详情")
+	 @GetMapping("/getSXFDetailList")
+	 public List<ProjectChbSxf> getSXFDetailList(String taskno){
+		 return projectChbSxfService.getSXFDetailList(taskno);
+	 }
+
+
 	/**
 	 * 分页列表查询
 	 *
@@ -59,8 +77,8 @@ public class ProjectChbSxfController extends JeecgController<ProjectChbSxf, IPro
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "kzks_project_chb_sxf-分页列表查询")
-	@ApiOperation(value="kzks_project_chb_sxf-分页列表查询", notes="kzks_project_chb_sxf-分页列表查询")
+	//@AutoLog(value = "筛选费-分页列表查询")
+	@ApiOperation(value="筛选费-分页列表查询", notes="筛选费-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<ProjectChbSxf>> queryPageList(ProjectChbSxf projectChbSxf,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -71,75 +89,75 @@ public class ProjectChbSxfController extends JeecgController<ProjectChbSxf, IPro
 		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")
+	@AutoLog(value = "筛选费-添加")
+	@ApiOperation(value="筛选费-添加", notes="筛选费-添加")
+	//@RequiresPermissions("org.jeecg.modules:筛选费: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")
+	@AutoLog(value = "筛选费-编辑")
+	@ApiOperation(value="筛选费-编辑", notes="筛选费-编辑")
+	//@RequiresPermissions("org.jeecg.modules:筛选费: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")
+	@AutoLog(value = "筛选费-通过id删除")
+	@ApiOperation(value="筛选费-通过id删除", notes="筛选费-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:筛选费: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")
+	@AutoLog(value = "筛选费-批量删除")
+	@ApiOperation(value="筛选费-批量删除", notes="筛选费-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:筛选费: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查询")
+	//@AutoLog(value = "筛选费-通过id查询")
+	@ApiOperation(value="筛选费-通过id查询", notes="筛选费-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<ProjectChbSxf> queryById(@RequestParam(name="id",required=true) String id) {
 		ProjectChbSxf projectChbSxf = projectChbSxfService.getById(id);
@@ -155,10 +173,10 @@ public class ProjectChbSxfController extends JeecgController<ProjectChbSxf, IPro
     * @param request
     * @param projectChbSxf
     */
-    //@RequiresPermissions("org.jeecg.modules:kzks_project_chb_sxf:exportXls")
+    //@RequiresPermissions("org.jeecg.modules:筛选费:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, ProjectChbSxf projectChbSxf) {
-        return super.exportXls(request, projectChbSxf, ProjectChbSxf.class, "kzks_project_chb_sxf");
+        return super.exportXls(request, projectChbSxf, ProjectChbSxf.class, "筛选费");
     }
 
     /**
@@ -168,7 +186,7 @@ public class ProjectChbSxfController extends JeecgController<ProjectChbSxf, IPro
     * @param response
     * @return
     */
-    //@RequiresPermissions("kzks_project_chb_sxf:importExcel")
+    //@RequiresPermissions("筛选费: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/mapper/ProjectChbSxfMapper.java

@@ -23,4 +23,7 @@ public interface ProjectChbSxfMapper extends BaseMapper<ProjectChbSxf> {
 
     @Delete("DELETE FROM kzks_project_chb_sxf WHERE nd = #{nd}")
     void deleteWxfByNd(String nd);
+
+    @Select("select * from kzks_project_chb_sxf where taskno = #{taskno}")
+    List<ProjectChbSxf> getSXFDetailList(String taskno);
 }

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

@@ -2,6 +2,9 @@ package org.jeecg.modules.projectChbSxf.service;
 
 import org.jeecg.modules.projectChbSxf.entity.ProjectChbSxf;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.List;
 
 /**
  * @Description: kzks_project_chb_sxf
@@ -14,4 +17,8 @@ public interface IProjectChbSxfService extends IService<ProjectChbSxf> {
     int getIfHaveThisNd(String nd);
 
     void deleteWxfByNd(String nd);
+
+    List<ProjectChbSxf> getSXFDetailList(String taskno);
+
+    ModelAndView exportSXFDetail(List<ProjectChbSxf> exportList, Class<ProjectChbSxf> clazz, String title);
 }

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

@@ -1,12 +1,21 @@
 package org.jeecg.modules.projectChbSxf.service.impl;
 
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.projectChbSxf.entity.ProjectChbSxf;
 import org.jeecg.modules.projectChbSxf.mapper.ProjectChbSxfMapper;
 import org.jeecg.modules.projectChbSxf.service.IProjectChbSxfService;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.List;
 
 /**
  * @Description: kzks_project_chb_sxf
@@ -20,6 +29,9 @@ public class ProjectChbSxfServiceImpl extends ServiceImpl<ProjectChbSxfMapper, P
     @Autowired
     private ProjectChbSxfMapper sxfMapper;
 
+    @Value("${jeecg.path.upload}")
+    private String upLoadPath;
+
     @Override
     public int getIfHaveThisNd(String nd) {
         return sxfMapper.getIfHaveThisNd(nd);
@@ -29,4 +41,28 @@ public class ProjectChbSxfServiceImpl extends ServiceImpl<ProjectChbSxfMapper, P
     public void deleteWxfByNd(String nd) {
         sxfMapper.deleteWxfByNd(nd);
     }
+
+    @Override
+    public List<ProjectChbSxf> getSXFDetailList(String taskno) {
+        return sxfMapper.getSXFDetailList(taskno) ;
+    }
+
+    @Override
+    public ModelAndView exportSXFDetail(List<ProjectChbSxf> exportList, Class<ProjectChbSxf> clazz, String title) {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        // Step.3 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        //此处设置的filename无效 ,前端会重更新设置一下
+        mv.addObject(NormalExcelConstants.FILE_NAME, title);
+        mv.addObject(NormalExcelConstants.CLASS, clazz);
+        //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
+//        ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + "admin111", title);
+
+        ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
+        exportParams.setImageBasePath(upLoadPath);
+        //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
+        mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+        mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+        return mv;
+    }
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbZjf/controller/KzksProjectChbZjfController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.projectChbZjf.controller;
 
 import java.util.Arrays;
+import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
@@ -14,6 +15,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyf;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -22,12 +24,12 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
  /**
- * @Description: kzks_project_chb_zjf
+ * @Description: 折旧费
  * @Author: jeecg-boot
  * @Date:   2024-01-17
  * @Version: V1.0
  */
-@Api(tags="kzks_project_chb_zjf")
+@Api(tags="折旧费")
 @RestController
 @RequestMapping("/projectChbZjf/kzksProjectChbZjf")
 @Slf4j
@@ -35,7 +37,22 @@ public class KzksProjectChbZjfController extends JeecgController<ProjectChbZjf,
 	@Autowired
 	private IKzksProjectChbZjfService kzksProjectChbZjfService;
 
-	/**
+	 @ApiOperation(value="项目成本——导出折旧费详情excel")
+	 @RequestMapping(value = "/exportZJFDetail")
+	 public ModelAndView exportZJFDetail(String taskno) {
+		 List<ProjectChbZjf> list = getZJFDetailList(taskno);
+		 return kzksProjectChbZjfService.exportZJFDetail(list,ProjectChbZjf.class, "折旧费详情");
+	 }
+
+	 /**项目成本——专用费详情——根据任务号查询*/
+	 @ApiOperation("项目成本——折旧费详情")
+	 @GetMapping("/getZJFDetailList")
+	 public List<ProjectChbZjf> getZJFDetailList(String taskno){
+		 return kzksProjectChbZjfService.getZJFDetailList(taskno);
+	 }
+
+
+	 /**
 	 * 分页列表查询
 	 *
 	 * @param projectChbZjf
@@ -44,8 +61,8 @@ public class KzksProjectChbZjfController extends JeecgController<ProjectChbZjf,
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "kzks_project_chb_zjf-分页列表查询")
-	@ApiOperation(value="kzks_project_chb_zjf-分页列表查询", notes="kzks_project_chb_zjf-分页列表查询")
+	//@AutoLog(value = "折旧费-分页列表查询")
+	@ApiOperation(value="折旧费-分页列表查询", notes="折旧费-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<ProjectChbZjf>> queryPageList(ProjectChbZjf projectChbZjf,
 													  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -63,9 +80,9 @@ public class KzksProjectChbZjfController extends JeecgController<ProjectChbZjf,
 	 * @param projectChbZjf
 	 * @return
 	 */
-	@AutoLog(value = "kzks_project_chb_zjf-添加")
-	@ApiOperation(value="kzks_project_chb_zjf-添加", notes="kzks_project_chb_zjf-添加")
-	//@RequiresPermissions("org.jeecg.modules:kzks_project_chb_zjf:add")
+	@AutoLog(value = "折旧费-添加")
+	@ApiOperation(value="折旧费-添加", notes="折旧费-添加")
+	//@RequiresPermissions("org.jeecg.modules:折旧费:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody ProjectChbZjf projectChbZjf) {
 		kzksProjectChbZjfService.save(projectChbZjf);
@@ -78,9 +95,9 @@ public class KzksProjectChbZjfController extends JeecgController<ProjectChbZjf,
 	 * @param projectChbZjf
 	 * @return
 	 */
-	@AutoLog(value = "kzks_project_chb_zjf-编辑")
-	@ApiOperation(value="kzks_project_chb_zjf-编辑", notes="kzks_project_chb_zjf-编辑")
-	//@RequiresPermissions("org.jeecg.modules:kzks_project_chb_zjf:edit")
+	@AutoLog(value = "折旧费-编辑")
+	@ApiOperation(value="折旧费-编辑", notes="折旧费-编辑")
+	//@RequiresPermissions("org.jeecg.modules:折旧费:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody ProjectChbZjf projectChbZjf) {
 		kzksProjectChbZjfService.updateById(projectChbZjf);
@@ -93,9 +110,9 @@ public class KzksProjectChbZjfController extends JeecgController<ProjectChbZjf,
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "kzks_project_chb_zjf-通过id删除")
-	@ApiOperation(value="kzks_project_chb_zjf-通过id删除", notes="kzks_project_chb_zjf-通过id删除")
-	//@RequiresPermissions("org.jeecg.modules:kzks_project_chb_zjf:delete")
+	@AutoLog(value = "折旧费-通过id删除")
+	@ApiOperation(value="折旧费-通过id删除", notes="折旧费-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:折旧费:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		kzksProjectChbZjfService.removeById(id);
@@ -108,9 +125,9 @@ public class KzksProjectChbZjfController extends JeecgController<ProjectChbZjf,
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "kzks_project_chb_zjf-批量删除")
-	@ApiOperation(value="kzks_project_chb_zjf-批量删除", notes="kzks_project_chb_zjf-批量删除")
-	//@RequiresPermissions("org.jeecg.modules:kzks_project_chb_zjf:deleteBatch")
+	@AutoLog(value = "折旧费-批量删除")
+	@ApiOperation(value="折旧费-批量删除", notes="折旧费-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:折旧费:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.kzksProjectChbZjfService.removeByIds(Arrays.asList(ids.split(",")));
@@ -123,8 +140,8 @@ public class KzksProjectChbZjfController extends JeecgController<ProjectChbZjf,
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "kzks_project_chb_zjf-通过id查询")
-	@ApiOperation(value="kzks_project_chb_zjf-通过id查询", notes="kzks_project_chb_zjf-通过id查询")
+	//@AutoLog(value = "折旧费-通过id查询")
+	@ApiOperation(value="折旧费-通过id查询", notes="折旧费-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<ProjectChbZjf> queryById(@RequestParam(name="id",required=true) String id) {
 		ProjectChbZjf projectChbZjf = kzksProjectChbZjfService.getById(id);
@@ -140,10 +157,10 @@ public class KzksProjectChbZjfController extends JeecgController<ProjectChbZjf,
     * @param request
     * @param projectChbZjf
     */
-    //@RequiresPermissions("org.jeecg.modules:kzks_project_chb_zjf:exportXls")
+    //@RequiresPermissions("org.jeecg.modules:折旧费:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, ProjectChbZjf projectChbZjf) {
-        return super.exportXls(request, projectChbZjf, ProjectChbZjf.class, "kzks_project_chb_zjf");
+        return super.exportXls(request, projectChbZjf, ProjectChbZjf.class, "折旧费");
     }
 
     /**
@@ -153,7 +170,7 @@ public class KzksProjectChbZjfController extends JeecgController<ProjectChbZjf,
     * @param response
     * @return
     */
-    //@RequiresPermissions("kzks_project_chb_zjf:importExcel")
+    //@RequiresPermissions("折旧费:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, ProjectChbZjf.class);

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

@@ -6,6 +6,8 @@ import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.projectChbZjf.entity.ProjectChbZjf;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * @Description: kzks_project_chb_zjf
  * @Author: jeecg-boot
@@ -20,4 +22,7 @@ public interface KzksProjectChbZjfMapper extends BaseMapper<ProjectChbZjf> {
 
     @Delete("DELETE FROM kzks_project_chb_zjf WHERE nd = #{nd}")
     void deleteWxfByNd(String nd);
+
+    @Select("select * from kzks_project_chb_zjf where taskno = #{taskno}")
+    List<ProjectChbZjf> getZJFDetailList(String taskno);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbZjf/service/IKzksProjectChbZjfService.java

@@ -2,6 +2,9 @@ package org.jeecg.modules.projectChbZjf.service;
 
 import org.jeecg.modules.projectChbZjf.entity.ProjectChbZjf;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.List;
 
 /**
  * @Description: kzks_project_chb_zjf
@@ -14,4 +17,8 @@ public interface IKzksProjectChbZjfService extends IService<ProjectChbZjf> {
     int getIfHaveThisNd(String nd);
 
     void deleteWxfByNd(String nd);
+
+    List<ProjectChbZjf> getZJFDetailList(String taskno);
+
+    ModelAndView exportZJFDetail(List<ProjectChbZjf> exportList, Class<ProjectChbZjf> clazz, String title);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbZjf/service/impl/KzksProjectChbZjfServiceImpl.java

@@ -1,12 +1,21 @@
 package org.jeecg.modules.projectChbZjf.service.impl;
 
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.projectChbZjf.entity.ProjectChbZjf;
 import org.jeecg.modules.projectChbZjf.mapper.KzksProjectChbZjfMapper;
 import org.jeecg.modules.projectChbZjf.service.IKzksProjectChbZjfService;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.List;
 
 /**
  * @Description: kzks_project_chb_zjf
@@ -19,6 +28,9 @@ public class KzksProjectChbZjfServiceImpl extends ServiceImpl<KzksProjectChbZjfM
 
     @Autowired
     private KzksProjectChbZjfMapper zjfMapper;
+
+    @Value("${jeecg.path.upload}")
+    private String upLoadPath;
     @Override
     public int getIfHaveThisNd(String nd) {
         return zjfMapper.getIfHaveThisNd(nd);
@@ -28,4 +40,28 @@ public class KzksProjectChbZjfServiceImpl extends ServiceImpl<KzksProjectChbZjfM
     public void deleteWxfByNd(String nd) {
         zjfMapper.deleteWxfByNd(nd);
     }
+
+    @Override
+    public List<ProjectChbZjf> getZJFDetailList(String taskno) {
+        return zjfMapper.getZJFDetailList(taskno);
+    }
+
+    @Override
+    public ModelAndView exportZJFDetail(List<ProjectChbZjf> exportList, Class<ProjectChbZjf> clazz, String title) {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        // Step.3 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        //此处设置的filename无效 ,前端会重更新设置一下
+        mv.addObject(NormalExcelConstants.FILE_NAME, title);
+        mv.addObject(NormalExcelConstants.CLASS, clazz);
+        //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
+//        ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + "admin111", title);
+
+        ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
+        exportParams.setImageBasePath(upLoadPath);
+        //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
+        mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+        mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+        return mv;
+    }
 }