Merge remote-tracking branch 'origin/master'

module_kzks/src/main/java/org/jeecg/modules/projectCost/controller/ProjectCostController.java

@@ -0,0 +1,177 @@
+package org.jeecg.modules.projectCost.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.projectCost.entity.ProjectCost;
+import org.jeecg.modules.projectCost.service.IProjectCostService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 项目成本
+ * @Author: jeecg-boot
+ * @Date:   2023-08-15
+ * @Version: V1.0
+ */
+@Api(tags="项目成本")
+@RestController
+@RequestMapping("/projectCost/projectCost")
+@Slf4j
+public class ProjectCostController extends JeecgController<ProjectCost, IProjectCostService> {
+	@Autowired
+	private IProjectCostService projectCostService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param projectCost
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "项目成本-分页列表查询")
+	@ApiOperation(value="项目成本-分页列表查询", notes="项目成本-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<ProjectCost>> queryPageList(ProjectCost projectCost,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ProjectCost> queryWrapper = QueryGenerator.initQueryWrapper(projectCost, req.getParameterMap());
+		Page<ProjectCost> page = new Page<ProjectCost>(pageNo, pageSize);
+		IPage<ProjectCost> pageList = projectCostService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param projectCost
+	 * @return
+	 */
+	@AutoLog(value = "项目成本-添加")
+	@ApiOperation(value="项目成本-添加", notes="项目成本-添加")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_cost:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody ProjectCost projectCost) {
+		projectCostService.save(projectCost);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param projectCost
+	 * @return
+	 */
+	@AutoLog(value = "项目成本-编辑")
+	@ApiOperation(value="项目成本-编辑", notes="项目成本-编辑")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_cost:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody ProjectCost projectCost) {
+		projectCostService.updateById(projectCost);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "项目成本-通过id删除")
+	@ApiOperation(value="项目成本-通过id删除", notes="项目成本-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_cost:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		projectCostService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "项目成本-批量删除")
+	@ApiOperation(value="项目成本-批量删除", notes="项目成本-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_cost:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.projectCostService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "项目成本-通过id查询")
+	@ApiOperation(value="项目成本-通过id查询", notes="项目成本-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<ProjectCost> queryById(@RequestParam(name="id",required=true) String id) {
+		ProjectCost projectCost = projectCostService.getById(id);
+		if(projectCost==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(projectCost);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param projectCost
+    */
+    //@RequiresPermissions("org.jeecg.modules:kzks_project_cost:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ProjectCost projectCost) {
+        return super.exportXls(request, projectCost, ProjectCost.class, "项目成本");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("kzks_project_cost:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ProjectCost.class);
+    }
+
+}

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

@@ -0,0 +1,217 @@
+package org.jeecg.modules.projectCost.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 项目成本
+ * @Author: jeecg-boot
+ * @Date:   2023-08-15
+ * @Version: V1.0
+ */
+@Data
+@TableName("kzks_project_cost")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="kzks_project_cost对象", description="项目成本")
+public class ProjectCost implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.Integer id;
+	/**任务号/来自科研任务*/
+	@Excel(name = "任务号/来自科研任务", width = 15)
+    @ApiModelProperty(value = "任务号/来自科研任务")
+    private java.lang.String taskno;
+	/**任务名称/来自科研任务*/
+	@Excel(name = "任务名称/来自科研任务", width = 15)
+    @ApiModelProperty(value = "任务名称/来自科研任务")
+    private java.lang.String taskname;
+	/**型号/来自科研报工*/
+	@Excel(name = "型号/来自科研报工", width = 15)
+    @ApiModelProperty(value = "型号/来自科研报工")
+    private java.lang.String xhname;
+	/**计划完成时间(进度要求)来自科研任务*/
+	@Excel(name = "计划完成时间(进度要求)来自科研任务", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "计划完成时间(进度要求)来自科研任务")
+    private java.util.Date jhwcsj;
+	/**阶段/来自科研报工*/
+	@Excel(name = "阶段/来自科研报工", width = 15)
+    @ApiModelProperty(value = "阶段/来自科研报工")
+    private java.lang.String yzjdname;
+	/**项目进度/来自科研任务*/
+	@Excel(name = "项目进度/来自科研任务", width = 15)
+    @ApiModelProperty(value = "项目进度/来自科研任务")
+    private java.lang.String processpercent;
+	/**成本进度*/
+	@Excel(name = "成本进度", width = 15)
+    @ApiModelProperty(value = "成本进度")
+    private java.lang.String costPercent;
+	/**研制数量/来自科研任务*/
+	@Excel(name = "研制数量/来自科研任务", width = 15)
+    @ApiModelProperty(value = "研制数量/来自科研任务")
+    private java.lang.Integer yzsl;
+	/**单台收入/（合同额or预估价）/研制数量*/
+	@Excel(name = "单台收入/（合同额or预估价）/研制数量", width = 15)
+    @ApiModelProperty(value = "单台收入/（合同额or预估价）/研制数量")
+    private java.math.BigDecimal oneIncome;
+	/**单台成本/  总成本额/研制数量*/
+	@Excel(name = "单台成本/  总成本额/研制数量", width = 15)
+    @ApiModelProperty(value = "单台成本/  总成本额/研制数量")
+    private java.math.BigDecimal oneCost;
+	/**单台利润/  利润额/研制数量*/
+	@Excel(name = "单台利润/  利润额/研制数量", width = 15)
+    @ApiModelProperty(value = "单台利润/  利润额/研制数量")
+    private java.math.BigDecimal oneProfit;
+	/**利润额/（合同额or预估价）-总成本额*/
+	@Excel(name = "利润额/（合同额or预估价）-总成本额", width = 15)
+    @ApiModelProperty(value = "利润额/（合同额or预估价）-总成本额")
+    private java.math.BigDecimal lre;
+	/**利润率/ 利润额/（合同额or预估价）*100%*/
+	@Excel(name = "利润率/ 利润额/（合同额or预估价）*100%", width = 15)
+    @ApiModelProperty(value = "利润率/ 利润额/（合同额or预估价）*100%")
+    private java.math.BigDecimal lrl;
+	/**预估价/来自财务预算*/
+	@Excel(name = "预估价/来自财务预算", width = 15)
+    @ApiModelProperty(value = "预估价/来自财务预算")
+    private java.math.BigDecimal estimationcoat;
+	/**合同额/来自收款合同的合同分配额 */
+	@Excel(name = "合同额/来自收款合同的合同分配额 ", width = 15)
+    @ApiModelProperty(value = "合同额/来自收款合同的合同分配额 ")
+    private java.math.BigDecimal contractfpe;
+	/**已收款/ 来自合同收款详细的任务收款额*/
+	@Excel(name = "已收款/ 来自合同收款详细的任务收款额", width = 15)
+    @ApiModelProperty(value = "已收款/ 来自合同收款详细的任务收款额")
+    private java.math.BigDecimal taskmoney;
+	/**总成本/ 直接成本+间接费用/直接成本=材料费（出库）+外协费+专用费+事务费/间接费用=工资费+管理费+燃动费+固资费*/
+	@Excel(name = "总成本/ 直接成本+间接费用/直接成本=材料费（出库）+外协费+专用费+事务费/间接费用=工资费+管理费+燃动费+固资费", width = 15)
+    @ApiModelProperty(value = "总成本/ 直接成本+间接费用/直接成本=材料费（出库）+外协费+专用费+事务费/间接费用=工资费+管理费+燃动费+固资费")
+    private java.math.BigDecimal zcb;
+	/**材料费/物资出库单明细 实发主数量*采购单价*/
+	@Excel(name = "材料费/物资出库单明细 实发主数量*采购单价", width = 15)
+    @ApiModelProperty(value = "材料费/物资出库单明细 实发主数量*采购单价")
+    private java.math.BigDecimal clf;
+	/**专用费*/
+	@Excel(name = "专用费", width = 15)
+    @ApiModelProperty(value = "专用费")
+    private java.math.BigDecimal zyf;
+	/**事务费*/
+	@Excel(name = "事务费", width = 15)
+    @ApiModelProperty(value = "事务费")
+    private java.math.BigDecimal swf;
+	/**外协费*/
+	@Excel(name = "外协费", width = 15)
+    @ApiModelProperty(value = "外协费")
+    private java.math.BigDecimal wxf;
+	/**燃料动力费/（材料费+外协费+事务费+专用费）×1.5%*/
+	@Excel(name = "燃料动力费/（材料费+外协费+事务费+专用费）×1.5%", width = 15)
+    @ApiModelProperty(value = "燃料动力费/（材料费+外协费+事务费+专用费）×1.5%")
+    private java.math.BigDecimal rldlf;
+	/**固定资产折旧/（材料费+外协费+事务费+专用费）×2.5%*/
+	@Excel(name = "固定资产折旧/（材料费+外协费+事务费+专用费）×2.5%", width = 15)
+    @ApiModelProperty(value = "固定资产折旧/（材料费+外协费+事务费+专用费）×2.5%")
+    private java.math.BigDecimal gdzczj;
+	/**工资及劳务费/（材料费+外协费+事务费+专用费）×17%*/
+	@Excel(name = "工资及劳务费/（材料费+外协费+事务费+专用费）×17%", width = 15)
+    @ApiModelProperty(value = "工资及劳务费/（材料费+外协费+事务费+专用费）×17%")
+    private java.math.BigDecimal gzjlwf;
+	/**管理费/（材料费+外协费+事务费+专用费）×5%*/
+	@Excel(name = "管理费/（材料费+外协费+事务费+专用费）×5%", width = 15)
+    @ApiModelProperty(value = "管理费/（材料费+外协费+事务费+专用费）×5%")
+    private java.math.BigDecimal glf;
+	/**装机成本/ mes装机信息卡的采购单价*数量*/
+	@Excel(name = "装机成本/ mes装机信息卡的采购单价*数量", width = 15)
+    @ApiModelProperty(value = "装机成本/ mes装机信息卡的采购单价*数量")
+    private java.math.BigDecimal zjcb;
+	/**内部试验*/
+	@Excel(name = "内部试验", width = 15)
+    @ApiModelProperty(value = "内部试验")
+    private java.math.BigDecimal lbsy;
+	/**工时(h)/来自科研报工，每次科研报工累加计时*/
+	@Excel(name = "工时(h)/来自科研报工，每次科研报工累加计时", width = 15)
+    @ApiModelProperty(value = "工时(h)/来自科研报工，每次科研报工累加计时")
+    private java.math.BigDecimal workhour;
+	/**责任部门/来自科研任务*/
+	@Excel(name = "责任部门/来自科研任务", width = 15)
+    @ApiModelProperty(value = "责任部门/来自科研任务")
+    private java.lang.String zrbm;
+	/**下达部门id/来自科研任务*/
+	@Excel(name = "下达部门id/来自科研任务", width = 15)
+    @ApiModelProperty(value = "下达部门id/来自科研任务")
+    private java.lang.Integer jycsid;
+	/**下达部门/来自科研任务*/
+	@Excel(name = "下达部门/来自科研任务", width = 15)
+    @ApiModelProperty(value = "下达部门/来自科研任务")
+    private java.lang.String jycs;
+	/**1：横向 2：纵向/来自科研任务*/
+	@Excel(name = "1：横向 2：纵向/来自科研任务", width = 15)
+    @ApiModelProperty(value = "1：横向 2：纵向/来自科研任务")
+    private java.lang.Integer hxzxid;
+	/**横向纵向/来自科研任务*/
+	@Excel(name = "横向纵向/来自科研任务", width = 15)
+    @ApiModelProperty(value = "横向纵向/来自科研任务")
+    private java.lang.String hxzxname;
+	/**任务类型/来自科研任务*/
+	@Excel(name = "任务类型/来自科研任务", width = 15)
+    @ApiModelProperty(value = "任务类型/来自科研任务")
+    private java.lang.String tasktype;
+	/**审计审价/来自科研任务*/
+	@Excel(name = "审计审价/来自科研任务", width = 15)
+    @ApiModelProperty(value = "审计审价/来自科研任务")
+    private java.lang.String auditprice;
+	/**任务状态/来自科研任务*/
+	@Excel(name = "任务状态/来自科研任务", width = 15)
+    @ApiModelProperty(value = "任务状态/来自科研任务")
+    private java.lang.String iflag;
+	/**提出单位简称/来自科研任务*/
+	@Excel(name = "提出单位简称/来自科研任务", width = 15)
+    @ApiModelProperty(value = "提出单位简称/来自科研任务")
+    private java.lang.String brief;
+	/**父级任务/来自科研任务*/
+	@Excel(name = "父级任务/来自科研任务", width = 15)
+    @ApiModelProperty(value = "父级任务/来自科研任务")
+    private java.lang.Integer reftaskno;
+	/**批产任务号/来自科研任务*/
+	@Excel(name = "批产任务号/来自科研任务", width = 15)
+    @ApiModelProperty(value = "批产任务号/来自科研任务")
+    private java.lang.Integer pccode;
+	/**备产任务号/来自科研任务*/
+	@Excel(name = "备产任务号/来自科研任务", width = 15)
+    @ApiModelProperty(value = "备产任务号/来自科研任务")
+    private java.lang.Integer bccode;
+	/**备料任务号/来自科研任务*/
+	@Excel(name = "备料任务号/来自科研任务", width = 15)
+    @ApiModelProperty(value = "备料任务号/来自科研任务")
+    private java.lang.Integer blcode;
+	/**业务员/来自科研任务*/
+	@Excel(name = "业务员/来自科研任务", width = 15)
+    @ApiModelProperty(value = "业务员/来自科研任务")
+    private java.lang.String businessman;
+	/**设计工时*/
+	@Excel(name = "设计工时", width = 15)
+    @ApiModelProperty(value = "设计工时")
+    private java.math.BigDecimal sjgs;
+	/**生产工时*/
+	@Excel(name = "生产工时", width = 15)
+    @ApiModelProperty(value = "生产工时")
+    private java.math.BigDecimal scgs;
+}

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

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

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

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

module_kzks/src/main/java/org/jeecg/modules/projectCost/service/IProjectCostService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.projectCost.service;
+
+import org.jeecg.modules.projectCost.entity.ProjectCost;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 项目成本
+ * @Author: jeecg-boot
+ * @Date:   2023-08-15
+ * @Version: V1.0
+ */
+public interface IProjectCostService extends IService<ProjectCost> {
+
+}

module_kzks/src/main/java/org/jeecg/modules/projectCost/service/impl/ProjectCostServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.projectCost.service.impl;
+
+import org.jeecg.modules.projectCost.entity.ProjectCost;
+import org.jeecg.modules.projectCost.mapper.ProjectCostMapper;
+import org.jeecg.modules.projectCost.service.IProjectCostService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 项目成本
+ * @Author: jeecg-boot
+ * @Date:   2023-08-15
+ * @Version: V1.0
+ */
+@Service
+public class ProjectCostServiceImpl extends ServiceImpl<ProjectCostMapper, ProjectCost> implements IProjectCostService {
+
+}