Browse Source

项目成本合同额、已收款详情

LLL 1 year ago
parent
commit
164aa824cf

+ 181 - 0
module_kzks/src/main/java/org/jeecg/modules/xmcbDetail/controller/ComContractInfoExchangeController.java

@@ -0,0 +1,181 @@
+package org.jeecg.modules.xmcbDetail.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.xmcbDetail.entity.ComContractInfoExchange;
+import org.jeecg.modules.xmcbDetail.service.IComContractInfoExchangeService;
+
+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.jeecg.modules.xmcbDetail.vo.ComContractInfoExchangeHTEVO;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.xmcbDetail.vo.ComContractInfoExchangeYSKVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 合同信息存储表
+ * @Author: jeecg-boot
+ * @Date:   2023-08-16
+ * @Version: V1.0
+ */
+@Api(tags="合同信息存储表")
+@RestController
+@RequestMapping("/xmcbDetail/comContractInfoExchange")
+@Slf4j
+public class ComContractInfoExchangeController extends JeecgController<ComContractInfoExchange, IComContractInfoExchangeService> {
+	@Autowired
+	private IComContractInfoExchangeService comContractInfoExchangeService;
+
+	 /**用于项目成本——合同额的详情*/
+	 @ApiOperation(value="项目成本——合同额的详情列表", notes="项目成本——合同额的详情列表")
+	 @GetMapping(value = "/getCrmHteDetail")
+	 public List<ComContractInfoExchangeHTEVO> getCrmHteDetail(String taskno){
+	 	return comContractInfoExchangeService.getCrmHteDetail(taskno);
+	 }
+
+	 /**用于项目成本——已收款的详情*/
+	 @ApiOperation(value="项目成本——已收款的详情列表", notes="项目成本——已收款的详情列表")
+	 @GetMapping(value = "/getCrmYskDetail")
+	 public List<ComContractInfoExchangeYSKVO> getCrmYskDetail(String taskno){
+		 return comContractInfoExchangeService.getCrmYskDetail(taskno);
+	 }
+
+
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param comContractInfoExchange
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "合同信息存储表-分页列表查询")
+	@ApiOperation(value="合同信息存储表-分页列表查询", notes="合同信息存储表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<ComContractInfoExchange>> queryPageList(ComContractInfoExchange comContractInfoExchange,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ComContractInfoExchange> queryWrapper = QueryGenerator.initQueryWrapper(comContractInfoExchange, req.getParameterMap());
+		Page<ComContractInfoExchange> page = new Page<ComContractInfoExchange>(pageNo, pageSize);
+		IPage<ComContractInfoExchange> pageList = comContractInfoExchangeService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param comContractInfoExchange
+	 * @return
+	 */
+	@AutoLog(value = "合同信息存储表-添加")
+	@ApiOperation(value="合同信息存储表-添加", notes="合同信息存储表-添加")
+	//@RequiresPermissions("org.jeecg.modules:com_contract_info_exchange:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody ComContractInfoExchange comContractInfoExchange) {
+		comContractInfoExchangeService.save(comContractInfoExchange);
+		return Result.OK("添加成功!");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param comContractInfoExchange
+	 * @return
+	 */
+	@AutoLog(value = "合同信息存储表-编辑")
+	@ApiOperation(value="合同信息存储表-编辑", notes="合同信息存储表-编辑")
+	//@RequiresPermissions("org.jeecg.modules:com_contract_info_exchange:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody ComContractInfoExchange comContractInfoExchange) {
+		comContractInfoExchangeService.updateById(comContractInfoExchange);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "合同信息存储表-通过id删除")
+	@ApiOperation(value="合同信息存储表-通过id删除", notes="合同信息存储表-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:com_contract_info_exchange:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		comContractInfoExchangeService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "合同信息存储表-批量删除")
+	@ApiOperation(value="合同信息存储表-批量删除", notes="合同信息存储表-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:com_contract_info_exchange:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.comContractInfoExchangeService.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<ComContractInfoExchange> queryById(@RequestParam(name="id",required=true) String id) {
+		ComContractInfoExchange comContractInfoExchange = comContractInfoExchangeService.getById(id);
+		if(comContractInfoExchange==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(comContractInfoExchange);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param comContractInfoExchange
+    */
+    //@RequiresPermissions("org.jeecg.modules:com_contract_info_exchange:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ComContractInfoExchange comContractInfoExchange) {
+        return super.exportXls(request, comContractInfoExchange, ComContractInfoExchange.class, "合同信息存储表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("com_contract_info_exchange:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ComContractInfoExchange.class);
+    }
+
+}

+ 397 - 0
module_kzks/src/main/java/org/jeecg/modules/xmcbDetail/entity/ComContractInfoExchange.java

@@ -0,0 +1,397 @@
+package org.jeecg.modules.xmcbDetail.entity;
+
+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;
+
+/**
+ * @Description: 合同信息存储表
+ * @Author: jeecg-boot
+ * @Date:   2023-08-16
+ * @Version: V1.0
+ */
+@Data
+@TableName("com_contract_info_exchange")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="com_contract_info_exchange对象", description="合同信息存储表")
+public class ComContractInfoExchange 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 bz;
+	/**编号.*/
+	@Excel(name = "编号.", width = 15)
+    @ApiModelProperty(value = "编号.")
+    private java.lang.String bh;
+	/**部门(合同付款).*/
+	@Excel(name = "部门(合同付款).", width = 15)
+    @ApiModelProperty(value = "部门(合同付款).")
+    private java.lang.String bm;
+	/**产品型号.*/
+	@Excel(name = "产品型号.", width = 15)
+    @ApiModelProperty(value = "产品型号.")
+    private java.lang.String cpxh;
+	/**待付款(元).*/
+	@Excel(name = "待付款(元).", width = 15)
+    @ApiModelProperty(value = "待付款(元).")
+    private java.math.BigDecimal dfk;
+	/**待开票(元).*/
+	@Excel(name = "待开票(元).", width = 15)
+    @ApiModelProperty(value = "待开票(元).")
+    private java.math.BigDecimal dkp;
+	/**到款(元).*/
+	@Excel(name = "到款(元).", width = 15)
+    @ApiModelProperty(value = "到款(元).")
+    private java.math.BigDecimal dk;
+	/**到款日期/汇票到期日期.*/
+	@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 dkhpdqrq;
+	/**电话.*/
+	@Excel(name = "电话.", width = 15)
+    @ApiModelProperty(value = "电话.")
+    private java.lang.String dh;
+	/**发票编号(sn).*/
+	@Excel(name = "发票编号(sn).", width = 15)
+    @ApiModelProperty(value = "发票编号(sn).")
+    private java.lang.String fpbh;
+	/**发票编码.*/
+	@Excel(name = "发票编码.", width = 15)
+    @ApiModelProperty(value = "发票编码.")
+    private java.lang.String fpbm;
+	/**发票开具额.*/
+	@Excel(name = "发票开具额.", width = 15)
+    @ApiModelProperty(value = "发票开具额.")
+    private java.math.BigDecimal fpkje;
+	/**发票类型.*/
+	@Excel(name = "发票类型.", width = 15)
+    @ApiModelProperty(value = "发票类型.")
+    private java.lang.String fplx;
+	/**发票内容.*/
+	@Excel(name = "发票内容.", width = 15)
+    @ApiModelProperty(value = "发票内容.")
+    private java.lang.String fpnr;
+	/**付款方名称.*/
+	@Excel(name = "付款方名称.", width = 15)
+    @ApiModelProperty(value = "付款方名称.")
+    private java.lang.String fkfmc;
+	/**更新时间.*/
+	@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 gxsj;
+	/**归档编号.*/
+	@Excel(name = "归档编号.", width = 15)
+    @ApiModelProperty(value = "归档编号.")
+    private java.lang.String gdbh;
+	/**归档日期.*/
+	@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 gdrq;
+	/**合同编号.*/
+	@Excel(name = "合同编号.", width = 15)
+    @ApiModelProperty(value = "合同编号.")
+    private java.lang.String htbh;
+	/**合同发票接收邮箱地址.*/
+	@Excel(name = "合同发票接收邮箱地址.", width = 15)
+    @ApiModelProperty(value = "合同发票接收邮箱地址.")
+    private java.lang.String htfpjsyxdz;
+	/**合同分配额.*/
+	@Excel(name = "合同分配额.", width = 15)
+    @ApiModelProperty(value = "合同分配额.")
+    private java.math.BigDecimal htfpe;
+	/**合同金额.*/
+	@Excel(name = "合同金额.", width = 15)
+    @ApiModelProperty(value = "合同金额.")
+    private java.math.BigDecimal htje;
+	/**合同款状态.*/
+	@Excel(name = "合同款状态.", width = 15)
+    @ApiModelProperty(value = "合同款状态.")
+    private java.lang.String htkzt;
+	/**合同类型.*/
+	@Excel(name = "合同类型.", width = 15)
+    @ApiModelProperty(value = "合同类型.")
+    private java.lang.String htlx;
+	/**合同履行情况.*/
+	@Excel(name = "合同履行情况.", width = 15)
+    @ApiModelProperty(value = "合同履行情况.")
+    private java.lang.String htlxqk;
+	/**合同密级.*/
+	@Excel(name = "合同密级.", width = 15)
+    @ApiModelProperty(value = "合同密级.")
+    private java.lang.String htmj;
+	/**合同名称.*/
+	@Excel(name = "合同名称.", width = 15)
+    @ApiModelProperty(value = "合同名称.")
+    private java.lang.String htmc;
+	/**合同起草人.*/
+	@Excel(name = "合同起草人.", width = 15)
+    @ApiModelProperty(value = "合同起草人.")
+    private java.lang.String htqcr;
+	/**合同签订日期.*/
+	@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 htqdrq;
+	/**合同任务id.*/
+	@Excel(name = "合同任务id.", width = 15)
+    @ApiModelProperty(value = "合同任务id.")
+    private java.lang.String htrwid;
+	/**合同数量.*/
+	@Excel(name = "合同数量.", width = 15)
+    @ApiModelProperty(value = "合同数量.")
+    private java.lang.Integer htsl;
+	/**合同页数.*/
+	@Excel(name = "合同页数.", width = 15)
+    @ApiModelProperty(value = "合同页数.")
+    private java.lang.Integer htys;
+	/**合同主管部门.*/
+	@Excel(name = "合同主管部门.", width = 15)
+    @ApiModelProperty(value = "合同主管部门.")
+    private java.lang.String htzgbm;
+	/**合同状态.*/
+	@Excel(name = "合同状态.", width = 15)
+    @ApiModelProperty(value = "合同状态.")
+    private java.lang.String htzt;
+	/**合同状态说明.*/
+	@Excel(name = "合同状态说明.", width = 15)
+    @ApiModelProperty(value = "合同状态说明.")
+    private java.lang.String htztsm;
+	/**甲方(付款方).*/
+	@Excel(name = "甲方(付款方).", width = 15)
+    @ApiModelProperty(value = "甲方(付款方).")
+    private java.lang.String jf;
+	/**甲方简称、用户简称.*/
+	@Excel(name = "甲方简称、用户简称.", width = 15)
+    @ApiModelProperty(value = "甲方简称、用户简称.")
+    private java.lang.String jfyhjc;
+	/**甲方签约人.*/
+	@Excel(name = "甲方签约人.", width = 15)
+    @ApiModelProperty(value = "甲方签约人.")
+    private java.lang.String jfqyr;
+	/**阶段.*/
+	@Excel(name = "阶段.", width = 15)
+    @ApiModelProperty(value = "阶段.")
+    private java.lang.String jd;
+	/**金额(元)、收款总金额、开票金额.*/
+	@Excel(name = "金额(元)、收款总金额、开票金额.", width = 15)
+    @ApiModelProperty(value = "金额(元)、收款总金额、开票金额.")
+    private java.math.BigDecimal jeskzkp;
+	/**开户行.*/
+	@Excel(name = "开户行.", width = 15)
+    @ApiModelProperty(value = "开户行.")
+    private java.lang.String khx;
+	/**开票时间.*/
+	@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 kpsj;
+	/**开票状态.*/
+	@Excel(name = "开票状态.", width = 15)
+    @ApiModelProperty(value = "开票状态.")
+    private java.lang.String kpzt;
+	/**客户id.*/
+	@Excel(name = "客户id.", width = 15)
+    @ApiModelProperty(value = "客户id.")
+    private java.lang.String khid;
+	/**客户流程编号.*/
+	@Excel(name = "客户流程编号.", width = 15)
+    @ApiModelProperty(value = "客户流程编号.")
+    private java.lang.String khlcbh;
+	/**联系人(对方).*/
+	@Excel(name = "联系人(对方).", width = 15)
+    @ApiModelProperty(value = "联系人(对方).")
+    private java.lang.String lxr;
+	/**录入人、申请人.*/
+	@Excel(name = "录入人、申请人.", width = 15)
+    @ApiModelProperty(value = "录入人、申请人.")
+    private java.lang.String lrsqr;
+	/**凭证号.*/
+	@Excel(name = "凭证号.", width = 15)
+    @ApiModelProperty(value = "凭证号.")
+    private java.lang.String pzh;
+	/**起草日期、录入日期、申请日期.*/
+	@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 qclrsqrq;
+	/**签署日期.*/
+	@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 qsrq;
+	/**确认外协.*/
+	@Excel(name = "确认外协.", width = 15)
+    @ApiModelProperty(value = "确认外协.")
+    private java.lang.String qrwx;
+	/**任务编号.*/
+	@Excel(name = "任务编号.", width = 15)
+    @ApiModelProperty(value = "任务编号.")
+    private java.lang.String rwbh;
+	/**任务名称.*/
+	@Excel(name = "任务名称.", width = 15)
+    @ApiModelProperty(value = "任务名称.")
+    private java.lang.String rwmc;
+	/**任务收款金额.*/
+	@Excel(name = "任务收款金额.", width = 15)
+    @ApiModelProperty(value = "任务收款金额.")
+    private java.math.BigDecimal rwskje;
+	/**申请人部门.*/
+	@Excel(name = "申请人部门.", width = 15)
+    @ApiModelProperty(value = "申请人部门.")
+    private java.lang.String sqrbm;
+	/**收款编号(sn).*/
+	@Excel(name = "收款编号(sn).", width = 15)
+    @ApiModelProperty(value = "收款编号(sn).")
+    private java.lang.String skbh;
+	/**收款科目代码.*/
+	@Excel(name = "收款科目代码.", width = 15)
+    @ApiModelProperty(value = "收款科目代码.")
+    private java.lang.String skkmdm;
+	/**收款类型.*/
+	@Excel(name = "收款类型.", width = 15)
+    @ApiModelProperty(value = "收款类型.")
+    private java.lang.String sklx;
+	/**数据来源:10:合同管理,20:合同任务,30:任务合同,40:合同付款,50:合同发票,60:外协合同.*/
+	@Excel(name = "数据来源:10:合同管理,20:合同任务,30:任务合同,40:合同付款,50:合同发票,60:外协合同.", width = 15)
+    @ApiModelProperty(value = "数据来源:10:合同管理,20:合同任务,30:任务合同,40:合同付款,50:合同发票,60:外协合同.")
+    private java.lang.Integer sjly;
+	/**数量(合同付款).*/
+	@Excel(name = "数量(合同付款).", width = 15)
+    @ApiModelProperty(value = "数量(合同付款).")
+    private java.lang.Integer sl;
+	/**税号.*/
+	@Excel(name = "税号.", width = 15)
+    @ApiModelProperty(value = "税号.")
+    private java.lang.String sh;
+	/**所属型号.*/
+	@Excel(name = "所属型号.", width = 15)
+    @ApiModelProperty(value = "所属型号.")
+    private java.lang.String ssxh;
+	/**外协单号(sn).*/
+	@Excel(name = "外协单号(sn).", width = 15)
+    @ApiModelProperty(value = "外协单号(sn).")
+    private java.lang.String wxdh;
+	/**外协合同编号.*/
+	@Excel(name = "外协合同编号.", width = 15)
+    @ApiModelProperty(value = "外协合同编号.")
+    private java.lang.String wxhtbh;
+	/**外协类型.*/
+	@Excel(name = "外协类型.", width = 15)
+    @ApiModelProperty(value = "外协类型.")
+    private java.lang.String wxlx;
+	/**项目密级.*/
+	@Excel(name = "项目密级.", width = 15)
+    @ApiModelProperty(value = "项目密级.")
+    private java.lang.String xmmj;
+	/**发票需求时间.*/
+	@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 fpxqsj;
+	/**序号.*/
+	@Excel(name = "序号.", width = 15)
+    @ApiModelProperty(value = "序号.")
+    private java.lang.String xh;
+	/**研制部门.*/
+	@Excel(name = "研制部门.", width = 15)
+    @ApiModelProperty(value = "研制部门.")
+    private java.lang.String yzbm;
+	/**业务员.*/
+	@Excel(name = "业务员.", width = 15)
+    @ApiModelProperty(value = "业务员.")
+    private java.lang.String ywy;
+	/**业务员部门.*/
+	@Excel(name = "业务员部门.", width = 15)
+    @ApiModelProperty(value = "业务员部门.")
+    private java.lang.String ywybm;
+	/**乙方(收款方).*/
+	@Excel(name = "乙方(收款方).", width = 15)
+    @ApiModelProperty(value = "乙方(收款方).")
+    private java.lang.String yf;
+	/**乙方签约人.*/
+	@Excel(name = "乙方签约人.", width = 15)
+    @ApiModelProperty(value = "乙方签约人.")
+    private java.lang.String yfqyr;
+	/**已开票(元).*/
+	@Excel(name = "已开票(元).", width = 15)
+    @ApiModelProperty(value = "已开票(元).")
+    private java.math.BigDecimal ykp;
+	/**已收款.*/
+	@Excel(name = "已收款.", width = 15)
+    @ApiModelProperty(value = "已收款.")
+    private java.math.BigDecimal ysk;
+	/**用户id.*/
+	@Excel(name = "用户id.", width = 15)
+    @ApiModelProperty(value = "用户id.")
+    private java.lang.String yhid;
+	/**用户简称.*/
+	@Excel(name = "用户简称.", width = 15)
+    @ApiModelProperty(value = "用户简称.")
+    private java.lang.String yhjc;
+	/**用户名称.*/
+	@Excel(name = "用户名称.", width = 15)
+    @ApiModelProperty(value = "用户名称.")
+    private java.lang.String yhmc;
+	/**账号.*/
+	@Excel(name = "账号.", width = 15)
+    @ApiModelProperty(value = "账号.")
+    private java.lang.String zh;
+	/**执行状态(status).*/
+	@Excel(name = "执行状态(status).", width = 15)
+    @ApiModelProperty(value = "执行状态(status).")
+    private java.lang.String zxzt;
+	/**主管设计师.*/
+	@Excel(name = "主管设计师.", width = 15)
+    @ApiModelProperty(value = "主管设计师.")
+    private java.lang.String zgsjs;
+	/**抓总部门.*/
+	@Excel(name = "抓总部门.", width = 15)
+    @ApiModelProperty(value = "抓总部门.")
+    private java.lang.String zzbm;
+	/**自筹(元).*/
+	@Excel(name = "自筹(元).", width = 15)
+    @ApiModelProperty(value = "自筹(元).")
+    private java.math.BigDecimal zc;
+	/**类型(无用).*/
+	@Excel(name = "类型(无用).", width = 15)
+    @ApiModelProperty(value = "类型(无用).")
+    private java.lang.String pici;
+	/**作废发票申请时间*/
+	@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 sqsj;
+	/**作废单号*/
+	@Excel(name = "作废单号", width = 15)
+    @ApiModelProperty(value = "作废单号")
+    private java.lang.String zfdh;
+}

+ 33 - 0
module_kzks/src/main/java/org/jeecg/modules/xmcbDetail/mapper/ComContractInfoExchangeMapper.java

@@ -0,0 +1,33 @@
+package org.jeecg.modules.xmcbDetail.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.xmcbDetail.entity.ComContractInfoExchange;
+import org.jeecg.modules.xmcbDetail.vo.ComContractInfoExchangeHTEVO;
+import org.jeecg.modules.xmcbDetail.vo.ComContractInfoExchangeYSKVO;
+
+import java.util.List;
+
+/**
+ * @Description: 合同信息存储表
+ * @Author: jeecg-boot
+ * @Date:   2023-08-16
+ * @Version: V1.0
+ */
+public interface ComContractInfoExchangeMapper extends BaseMapper<ComContractInfoExchange> {
+
+
+    /**用于项目成本——合同额的详情*/
+    @Select("select pici ,yhid ,xh ,ssxh ,rwbh ,rwmc ,cpxh ,jd ,yzbm ,zgsjs ,htfpe ,ysk ,htbh ,htmc ,htzt ,htlx ," +
+            "qsrq ,htmj ,xmmj ,htsl ,htys ,gdbh ,gdrq ,htkzt ,jf ,jfyhjc ,yf ,jeskzkp ,zc ,dk ,dfk ,kpzt ,ykp ," +
+            "dkp ,lxr ,dh ,htqcr ,qclrsqrq ,htzgbm ,ywy ,zzbm ,htlxqk ,htztsm from com_contract_info_exchange " +
+            "where sjly = 30 and rwbh=#{taskno}")
+    public List<ComContractInfoExchangeHTEVO> getCrmHteDetail(@Param("taskno") String taskno);
+
+    /**项目成本——已收款的详情*/
+    @Select("select pici,khid,khlcbh,xh,bh,skbh,zxzt,fkfmc,yhjc,htbh,htmc,htlx,cpxh,jd,sl,bm,htzgbm,rwbh,rwmc, " +
+            "jeskzkp,rwskje,dkhpdqrq,sklx,skkmdm,pzh,ywy,lrsqr,qclrsqrq from com_contract_info_exchange " +
+            "where sjly=40 AND DATE_FORMAT(`dkhpdqrq`,'%Y') > '2015' and rwbh=#{taskno};")
+    public List<ComContractInfoExchangeYSKVO> getCrmYskDetail(@Param("taskno") String taskno);
+}

+ 5 - 0
module_kzks/src/main/java/org/jeecg/modules/xmcbDetail/mapper/xml/ComContractInfoExchangeMapper.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.xmcbDetail.mapper.ComContractInfoExchangeMapper">
+
+</mapper>

+ 24 - 0
module_kzks/src/main/java/org/jeecg/modules/xmcbDetail/service/IComContractInfoExchangeService.java

@@ -0,0 +1,24 @@
+package org.jeecg.modules.xmcbDetail.service;
+
+import org.jeecg.modules.xmcbDetail.entity.ComContractInfoExchange;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.xmcbDetail.vo.ComContractInfoExchangeHTEVO;
+import org.jeecg.modules.xmcbDetail.vo.ComContractInfoExchangeYSKVO;
+
+import java.util.List;
+
+/**
+ * @Description: 合同信息存储表
+ * @Author: jeecg-boot
+ * @Date:   2023-08-16
+ * @Version: V1.0
+ */
+public interface IComContractInfoExchangeService extends IService<ComContractInfoExchange> {
+
+    /**用于项目成本——合同额的详情*/
+    public List<ComContractInfoExchangeHTEVO> getCrmHteDetail(String taskno);
+
+    /**项目成本——已收款的详情*/
+    public List<ComContractInfoExchangeYSKVO> getCrmYskDetail(String taskno);
+
+}

+ 39 - 0
module_kzks/src/main/java/org/jeecg/modules/xmcbDetail/service/impl/ComContractInfoExchangeServiceImpl.java

@@ -0,0 +1,39 @@
+package org.jeecg.modules.xmcbDetail.service.impl;
+
+import org.jeecg.modules.xmcbDetail.entity.ComContractInfoExchange;
+import org.jeecg.modules.xmcbDetail.mapper.ComContractInfoExchangeMapper;
+import org.jeecg.modules.xmcbDetail.service.IComContractInfoExchangeService;
+import org.jeecg.modules.xmcbDetail.vo.ComContractInfoExchangeHTEVO;
+import org.jeecg.modules.xmcbDetail.vo.ComContractInfoExchangeYSKVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.List;
+
+/**
+ * @Description: 合同信息存储表
+ * @Author: jeecg-boot
+ * @Date:   2023-08-16
+ * @Version: V1.0
+ */
+@Service
+public class ComContractInfoExchangeServiceImpl extends ServiceImpl<ComContractInfoExchangeMapper, ComContractInfoExchange> implements IComContractInfoExchangeService {
+
+    @Autowired
+    @SuppressWarnings("all")
+    private ComContractInfoExchangeMapper comContractInfoExchangeMapper;
+
+    /**用于项目成本——合同额的详情*/
+    public List<ComContractInfoExchangeHTEVO> getCrmHteDetail(String taskno){
+        return comContractInfoExchangeMapper.getCrmHteDetail(taskno);
+    }
+
+
+    /**项目成本——已收款的详情*/
+    public List<ComContractInfoExchangeYSKVO> getCrmYskDetail(String taskno){
+        return comContractInfoExchangeMapper.getCrmYskDetail(taskno);
+    }
+
+}

+ 188 - 0
module_kzks/src/main/java/org/jeecg/modules/xmcbDetail/vo/ComContractInfoExchangeHTEVO.java

@@ -0,0 +1,188 @@
+package org.jeecg.modules.xmcbDetail.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+@Data
+public class ComContractInfoExchangeHTEVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**类型(无用).*/
+    @Excel(name = "类型(无用).", width = 15)
+    @ApiModelProperty(value = "类型(无用).")
+    private java.lang.String pici;
+    /**用户id.*/
+    @Excel(name = "用户id.", width = 15)
+    @ApiModelProperty(value = "用户id.")
+    private java.lang.String yhid;
+    /**序号.*/
+    @Excel(name = "序号.", width = 15)
+    @ApiModelProperty(value = "序号.")
+    private java.lang.String xh;
+    /**所属型号.*/
+    @Excel(name = "所属型号.", width = 15)
+    @ApiModelProperty(value = "所属型号.")
+    private java.lang.String ssxh;
+    /**任务编号.*/
+    @Excel(name = "任务编号.", width = 15)
+    @ApiModelProperty(value = "任务编号.")
+    private java.lang.String rwbh;
+    /**任务名称.*/
+    @Excel(name = "任务名称.", width = 15)
+    @ApiModelProperty(value = "任务名称.")
+    private java.lang.String rwmc;
+    /**产品型号.*/
+    @Excel(name = "产品型号.", width = 15)
+    @ApiModelProperty(value = "产品型号.")
+    private java.lang.String cpxh;
+    /**阶段.*/
+    @Excel(name = "阶段.", width = 15)
+    @ApiModelProperty(value = "阶段.")
+    private java.lang.String jd;
+    /**研制部门.*/
+    @Excel(name = "研制部门.", width = 15)
+    @ApiModelProperty(value = "研制部门.")
+    private java.lang.String yzbm;
+    /**主管设计师.*/
+    @Excel(name = "主管设计师.", width = 15)
+    @ApiModelProperty(value = "主管设计师.")
+    private java.lang.String zgsjs;
+    /**合同分配额.*/
+    @Excel(name = "合同分配额.", width = 15)
+    @ApiModelProperty(value = "合同分配额.")
+    private java.math.BigDecimal htfpe;
+    /**已收款.*/
+    @Excel(name = "已收款.", width = 15)
+    @ApiModelProperty(value = "已收款.")
+    private java.math.BigDecimal ysk;
+    /**合同编号.*/
+    @Excel(name = "合同编号.", width = 15)
+    @ApiModelProperty(value = "合同编号.")
+    private java.lang.String htbh;
+    /**合同名称.*/
+    @Excel(name = "合同名称.", width = 15)
+    @ApiModelProperty(value = "合同名称.")
+    private java.lang.String htmc;
+    /**合同状态.*/
+    @Excel(name = "合同状态.", width = 15)
+    @ApiModelProperty(value = "合同状态.")
+    private java.lang.String htzt;
+    /**合同类型.*/
+    @Excel(name = "合同类型.", width = 15)
+    @ApiModelProperty(value = "合同类型.")
+    private java.lang.String htlx;
+    /**合同密级.*/
+    @Excel(name = "合同密级.", width = 15)
+    @ApiModelProperty(value = "合同密级.")
+    private java.lang.String htmj;
+    /**项目密级.*/
+    @Excel(name = "项目密级.", width = 15)
+    @ApiModelProperty(value = "项目密级.")
+    private java.lang.String xmmj;
+    /**合同数量.*/
+    @Excel(name = "合同数量.", width = 15)
+    @ApiModelProperty(value = "合同数量.")
+    private java.lang.Integer htsl;
+    /**合同页数.*/
+    @Excel(name = "合同页数.", width = 15)
+    @ApiModelProperty(value = "合同页数.")
+    private java.lang.Integer htys;
+    /**归档编号.*/
+    @Excel(name = "归档编号.", width = 15)
+    @ApiModelProperty(value = "归档编号.")
+    private java.lang.String gdbh;
+    /**归档日期.*/
+    @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 gdrq;
+    /**合同款状态.*/
+    @Excel(name = "合同款状态.", width = 15)
+    @ApiModelProperty(value = "合同款状态.")
+    private java.lang.String htkzt;
+    /**甲方(付款方).*/
+    @Excel(name = "甲方(付款方).", width = 15)
+    @ApiModelProperty(value = "甲方(付款方).")
+    private java.lang.String jf;
+    /**甲方简称、用户简称.*/
+    @Excel(name = "甲方简称、用户简称.", width = 15)
+    @ApiModelProperty(value = "甲方简称、用户简称.")
+    private java.lang.String jfyhjc;
+    /**乙方(收款方).*/
+    @Excel(name = "乙方(收款方).", width = 15)
+    @ApiModelProperty(value = "乙方(收款方).")
+    private java.lang.String yf;
+    /**金额(元)、收款总金额、开票金额.*/
+    @Excel(name = "金额(元)、收款总金额、开票金额.", width = 15)
+    @ApiModelProperty(value = "金额(元)、收款总金额、开票金额.")
+    private java.math.BigDecimal jeskzkp;
+    /**自筹(元).*/
+    @Excel(name = "自筹(元).", width = 15)
+    @ApiModelProperty(value = "自筹(元).")
+    private java.math.BigDecimal zc;
+    /**到款(元).*/
+    @Excel(name = "到款(元).", width = 15)
+    @ApiModelProperty(value = "到款(元).")
+    private java.math.BigDecimal dk;
+    /**待付款(元).*/
+    @Excel(name = "待付款(元).", width = 15)
+    @ApiModelProperty(value = "待付款(元).")
+    private java.math.BigDecimal dfk;
+    /**开票状态.*/
+    @Excel(name = "开票状态.", width = 15)
+    @ApiModelProperty(value = "开票状态.")
+    private java.lang.String kpzt;
+    /**已开票(元).*/
+    @Excel(name = "已开票(元).", width = 15)
+    @ApiModelProperty(value = "已开票(元).")
+    private java.math.BigDecimal ykp;
+    /**待开票(元).*/
+    @Excel(name = "待开票(元).", width = 15)
+    @ApiModelProperty(value = "待开票(元).")
+    private java.math.BigDecimal dkp;
+    /**联系人(对方).*/
+    @Excel(name = "联系人(对方).", width = 15)
+    @ApiModelProperty(value = "联系人(对方).")
+    private java.lang.String lxr;
+    /**电话.*/
+    @Excel(name = "电话.", width = 15)
+    @ApiModelProperty(value = "电话.")
+    private java.lang.String dh;
+    /**合同起草人.*/
+    @Excel(name = "合同起草人.", width = 15)
+    @ApiModelProperty(value = "合同起草人.")
+    private java.lang.String htqcr;
+    /**起草日期、录入日期、申请日期.*/
+    @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 qclrsqrq;
+    /**合同主管部门.*/
+    @Excel(name = "合同主管部门.", width = 15)
+    @ApiModelProperty(value = "合同主管部门.")
+    private java.lang.String htzgbm;
+    /**业务员.*/
+    @Excel(name = "业务员.", width = 15)
+    @ApiModelProperty(value = "业务员.")
+    private java.lang.String ywy;
+    /**抓总部门.*/
+    @Excel(name = "抓总部门.", width = 15)
+    @ApiModelProperty(value = "抓总部门.")
+    private java.lang.String zzbm;
+    /**合同履行情况.*/
+    @Excel(name = "合同履行情况.", width = 15)
+    @ApiModelProperty(value = "合同履行情况.")
+    private java.lang.String htlxqk;
+    /**合同状态说明.*/
+    @Excel(name = "合同状态说明.", width = 15)
+    @ApiModelProperty(value = "合同状态说明.")
+    private java.lang.String htztsm;
+
+}

+ 131 - 0
module_kzks/src/main/java/org/jeecg/modules/xmcbDetail/vo/ComContractInfoExchangeYSKVO.java

@@ -0,0 +1,131 @@
+package org.jeecg.modules.xmcbDetail.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+@Data
+public class ComContractInfoExchangeYSKVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**类型(无用).*/
+    @Excel(name = "类型(无用).", width = 15)
+    @ApiModelProperty(value = "类型(无用).")
+    private java.lang.String pici;
+    /**客户id.*/
+    @Excel(name = "客户id.", width = 15)
+    @ApiModelProperty(value = "客户id.")
+    private java.lang.String khid;
+    /**客户流程编号.*/
+    @Excel(name = "客户流程编号.", width = 15)
+    @ApiModelProperty(value = "客户流程编号.")
+    private java.lang.String khlcbh;
+    /**序号.*/
+    @Excel(name = "序号.", width = 15)
+    @ApiModelProperty(value = "序号.")
+    private java.lang.String xh;
+    /**编号.*/
+    @Excel(name = "编号.", width = 15)
+    @ApiModelProperty(value = "编号.")
+    private java.lang.String bh;
+    /**收款编号(sn).*/
+    @Excel(name = "收款编号(sn).", width = 15)
+    @ApiModelProperty(value = "收款编号(sn).")
+    private java.lang.String skbh;
+    /**执行状态(status).*/
+    @Excel(name = "执行状态(status).", width = 15)
+    @ApiModelProperty(value = "执行状态(status).")
+    private java.lang.String zxzt;
+    /**付款方名称.*/
+    @Excel(name = "付款方名称.", width = 15)
+    @ApiModelProperty(value = "付款方名称.")
+    private java.lang.String fkfmc;
+    /**用户简称.*/
+    @Excel(name = "用户简称.", width = 15)
+    @ApiModelProperty(value = "用户简称.")
+    private java.lang.String yhjc;
+    /**合同编号.*/
+    @Excel(name = "合同编号.", width = 15)
+    @ApiModelProperty(value = "合同编号.")
+    private java.lang.String htbh;
+    /**合同名称.*/
+    @Excel(name = "合同名称.", width = 15)
+    @ApiModelProperty(value = "合同名称.")
+    private java.lang.String htmc;
+    /**合同类型.*/
+    @Excel(name = "合同类型.", width = 15)
+    @ApiModelProperty(value = "合同类型.")
+    private java.lang.String htlx;
+    /**产品型号.*/
+    @Excel(name = "产品型号.", width = 15)
+    @ApiModelProperty(value = "产品型号.")
+    private java.lang.String cpxh;
+    /**阶段.*/
+    @Excel(name = "阶段.", width = 15)
+    @ApiModelProperty(value = "阶段.")
+    private java.lang.String jd;
+    /**数量(合同付款).*/
+    @Excel(name = "数量(合同付款).", width = 15)
+    @ApiModelProperty(value = "数量(合同付款).")
+    private java.lang.Integer sl;
+    /**部门(合同付款).*/
+    @Excel(name = "部门(合同付款).", width = 15)
+    @ApiModelProperty(value = "部门(合同付款).")
+    private java.lang.String bm;
+    /**合同主管部门.*/
+    @Excel(name = "合同主管部门.", width = 15)
+    @ApiModelProperty(value = "合同主管部门.")
+    private java.lang.String htzgbm;
+    /**任务编号.*/
+    @Excel(name = "任务编号.", width = 15)
+    @ApiModelProperty(value = "任务编号.")
+    private java.lang.String rwbh;
+    /**任务名称.*/
+    @Excel(name = "任务名称.", width = 15)
+    @ApiModelProperty(value = "任务名称.")
+    private java.lang.String rwmc;
+    /**金额(元)、收款总金额、开票金额.*/
+    @Excel(name = "金额(元)、收款总金额、开票金额.", width = 15)
+    @ApiModelProperty(value = "金额(元)、收款总金额、开票金额.")
+    private java.math.BigDecimal jeskzkp;
+    /**任务收款金额.*/
+    @Excel(name = "任务收款金额.", width = 15)
+    @ApiModelProperty(value = "任务收款金额.")
+    private java.math.BigDecimal rwskje;
+    /**到款日期/汇票到期日期.*/
+    @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 dkhpdqrq;
+    /**收款科目代码.*/
+    @Excel(name = "收款科目代码.", width = 15)
+    @ApiModelProperty(value = "收款科目代码.")
+    private java.lang.String skkmdm;
+    /**收款类型.*/
+    @Excel(name = "收款类型.", width = 15)
+    @ApiModelProperty(value = "收款类型.")
+    private java.lang.String sklx;
+    /**凭证号.*/
+    @Excel(name = "凭证号.", width = 15)
+    @ApiModelProperty(value = "凭证号.")
+    private java.lang.String pzh;
+    /**业务员.*/
+    @Excel(name = "业务员.", width = 15)
+    @ApiModelProperty(value = "业务员.")
+    private java.lang.String ywy;
+    /**录入人、申请人.*/
+    @Excel(name = "录入人、申请人.", width = 15)
+    @ApiModelProperty(value = "录入人、申请人.")
+    private java.lang.String lrsqr;
+    /**起草日期、录入日期、申请日期.*/
+    @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 qclrsqrq;
+}