Commit ccc5651d authored by fangxinjiang's avatar fangxinjiang

项目信息EKP对接接口测试

parent 31910396
...@@ -354,12 +354,19 @@ public class TSettleDomain extends BaseEntity { ...@@ -354,12 +354,19 @@ public class TSettleDomain extends BaseEntity {
@Schema(description = "商险结算类型0 合并 1 单独") @Schema(description = "商险结算类型0 合并 1 单独")
private String insuranceSettleType; private String insuranceSettleType;
/** /**
* 封面抬头 * 封面抬头-薪资
*/ */
@ExcelAttribute(name = "封面抬头", maxLength = 50) @ExcelAttribute(name = "封面抬头-薪资", maxLength = 50)
@Length(max = 50, message = "封面抬头不能超过50个字符") @Length(max = 50, message = "封面抬头-薪资不能超过50个字符")
@ExcelProperty("封面抬头") @ExcelProperty("封面抬头-薪资")
private String invoiceTitle; private String invoiceTitleSalary;
/**
* 封面抬头-商险
*/
@ExcelAttribute(name = "封面抬头-商险", maxLength = 50)
@Length(max = 50, message = "封面抬头-商险不能超过50个字符")
@ExcelProperty("封面抬头-商险")
private String invoiceTitleInsurance;
/** /**
* 我司到款单位 * 我司到款单位
*/ */
......
package com.yifu.cloud.plus.v1.yifu.archives.vo; package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import org.hibernate.validator.constraints.Length;
import java.io.Serializable; import java.io.Serializable;
...@@ -89,4 +92,15 @@ public class ProjectSetInfoVo implements Serializable { ...@@ -89,4 +92,15 @@ public class ProjectSetInfoVo implements Serializable {
*/ */
@Schema(description = "服务状态:0正常 1停止服务") @Schema(description = "服务状态:0正常 1停止服务")
private String stopFlag; private String stopFlag;
/**
* 封面抬头-薪资
*/
@Schema(description="封面抬头-薪资")
private String invoiceTitleSalary;
/**
* 封面抬头-商险
*/
@Schema(description="封面抬头-商险")
private String invoiceTitleInsurance;
} }
...@@ -258,13 +258,13 @@ public class TSettleDomainController { ...@@ -258,13 +258,13 @@ public class TSettleDomainController {
} }
/** /**
* 修改项目表 * 修改项目表--EKP调用接口
* * @author hyc
* @param list 项目表 * @param list 项目表
* @return R * @return R
*/ */
@Operation(summary = "修改项目表", description = "修改项目表") @Operation(summary = "修改项目表--EKP调用接口", description = "修改项目表--EKP调用接口")
@SysLog("修改项目表") @SysLog("修改项目表--EKP调用接口")
@PostMapping("/updateProjectInfo") @PostMapping("/updateProjectInfo")
public R updateProjectInfo(@RequestBody List<TSettleDomain> list) { public R updateProjectInfo(@RequestBody List<TSettleDomain> list) {
return tSettleDomainService.updateProjectInfo(list); return tSettleDomainService.updateProjectInfo(list);
......
...@@ -74,7 +74,8 @@ ...@@ -74,7 +74,8 @@
<result property="socialType" column="SOCIAL_TYPE"/> <result property="socialType" column="SOCIAL_TYPE"/>
<result property="fundType" column="FUND_TYPE"/> <result property="fundType" column="FUND_TYPE"/>
<result property="insuranceSettleType" column="INSURANCE_SETTLE_TYPE"/> <result property="insuranceSettleType" column="INSURANCE_SETTLE_TYPE"/>
<result property="invoiceTitle" column="INVOICE_TITLE"/> <result property="invoiceTitleSalary" column="INVOICE_TITLE_SALARY"/>
<result property="invoiceTitleInsurance" column="INVOICE_TITLE_INSURANCE"/>
<result property="unitOfOurCompany" column="UNIT_OF_OUR_COMPANY"/> <result property="unitOfOurCompany" column="UNIT_OF_OUR_COMPANY"/>
<result property="customerNo" column="CUSTOMER_NO"/> <result property="customerNo" column="CUSTOMER_NO"/>
<result property="customerName" column="CUSTOMER_NAME"/> <result property="customerName" column="CUSTOMER_NAME"/>
...@@ -147,7 +148,8 @@ ...@@ -147,7 +148,8 @@
a.CUSTOMER_NO, a.CUSTOMER_NO,
a.CUSTOMER_NAME, a.CUSTOMER_NAME,
a.UNIT_OF_OUR_COMPANY, a.UNIT_OF_OUR_COMPANY,
a.INVOICE_TITLE, a.INVOICE_TITLE_SALARY,
a.INVOICE_TITLE_INSURANCE
a.FUND_TYPE, a.FUND_TYPE,
a.MR_SETTLE_TYPE, a.MR_SETTLE_TYPE,
a.MANAGEMENT_TAG, a.MANAGEMENT_TAG,
...@@ -253,7 +255,8 @@ ...@@ -253,7 +255,8 @@
a.BUSINESS_SECOND_TYPE, a.BUSINESS_SECOND_TYPE,
a.BUSINESS_THIRD_TYPE, a.BUSINESS_THIRD_TYPE,
a.STOP_FLAG, a.STOP_FLAG,
a.INVOICE_TITLE a.INVOICE_TITLE_SALARY,
a.INVOICE_TITLE_INSURANCE
FROM t_settle_domain a FROM t_settle_domain a
LEFT JOIN t_customer_info c ON a.CUSTOMER_ID = c.ID LEFT JOIN t_customer_info c ON a.CUSTOMER_ID = c.ID
where 1=1 where 1=1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment