Commit a13d9c21 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.15' into MVP1.7.15

parents 5a75dff4 7eaeaad6
...@@ -31,11 +31,6 @@ public class InsuranceExportListOneVO implements Serializable { ...@@ -31,11 +31,6 @@ public class InsuranceExportListOneVO implements Serializable {
@Schema(description = "项目名称") @Schema(description = "项目名称")
private String projectName; private String projectName;
/**
* 客户名称
*/
@Schema(description = "客户名称")
private String unitName;
/** /**
* 项目编码 * 项目编码
...@@ -184,12 +179,6 @@ public class InsuranceExportListOneVO implements Serializable { ...@@ -184,12 +179,6 @@ public class InsuranceExportListOneVO implements Serializable {
@Schema(description = "封面抬头") @Schema(description = "封面抬头")
private String invoiceTitle; private String invoiceTitle;
/**
* 是否地市自购0是 1 否
*/
@Schema(description = "是否地市自购")
private String isAdress;
/** /**
* 派单备注 * 派单备注
*/ */
...@@ -197,4 +186,10 @@ public class InsuranceExportListOneVO implements Serializable { ...@@ -197,4 +186,10 @@ public class InsuranceExportListOneVO implements Serializable {
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "派单备注") @ExcelProperty(value = "派单备注")
private String remarkDispatch; private String remarkDispatch;
/**
* 客户名称
*/
@Schema(description = "客户名称")
private String unitName;
} }
...@@ -223,12 +223,6 @@ public class RefundExportListVo implements Serializable { ...@@ -223,12 +223,6 @@ public class RefundExportListVo implements Serializable {
@Schema(description = "派单日期") @Schema(description = "派单日期")
private LocalDateTime createTime; private LocalDateTime createTime;
/**
* 是否地市自购0是 1 否
*/
@Schema(description = "是否地市自购")
private String isAdress;
@Schema(description ="客户名称") @Schema(description ="客户名称")
private String unitName; private String unitName;
......
...@@ -505,8 +505,7 @@ ...@@ -505,8 +505,7 @@
a.SETTLE_TYPE as settleType, a.SETTLE_TYPE as settleType,
a.CREATE_NAME as createName, a.CREATE_NAME as createName,
a.POLICY_NO as policyNo, a.POLICY_NO as policyNo,
a.REMARK as remark, a.REMARK as remark,a.UNIT_NAME as unitName
a.IS_ADRESS as isAdress,a.UNIT_NAME as unitName
from t_insurance_detail a from t_insurance_detail a
where a.DELETE_FLAG = 0 and a.id in where a.DELETE_FLAG = 0 and a.id in
<foreach collection="idList" index="index" item="item" open="(" separator="," close=")"> <foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
...@@ -538,8 +537,7 @@ ...@@ -538,8 +537,7 @@
a.SETTLE_TYPE as settleType, a.SETTLE_TYPE as settleType,
a.CREATE_NAME as createName, a.CREATE_NAME as createName,
a.POLICY_NO as policyNo, a.POLICY_NO as policyNo,
a.REMARK as remark, a.REMARK as remark,a.UNIT_NAME as unitName
a.IS_ADRESS as isAdress,a.UNIT_NAME as unitName
from t_insurance_detail a from t_insurance_detail a
where a.DELETE_FLAG = 0 and a.BUY_HANDLE_STATUS = #{param.buyHandleStatus} where a.DELETE_FLAG = 0 and a.BUY_HANDLE_STATUS = #{param.buyHandleStatus}
<if test="param.empName != null and param.empName.trim() != ''"> <if test="param.empName != null and param.empName.trim() != ''">
...@@ -1243,8 +1241,7 @@ ...@@ -1243,8 +1241,7 @@
a.POLICY_NO as policyNo, a.POLICY_NO as policyNo,
refund.CREATE_NAME as createName, refund.CREATE_NAME as createName,
a.REDUCE_HANDLE_STATUS as reduceHandleStatus, a.REDUCE_HANDLE_STATUS as reduceHandleStatus,
refund.REMARK as remark, refund.REMARK as remark,a.UNIT_NAME as unitName
a.IS_ADRESS as isAdress,a.UNIT_NAME as unitName
from from
t_insurance_detail a, t_insurance_detail a,
t_insurance_refund refund t_insurance_refund refund
...@@ -1281,8 +1278,7 @@ ...@@ -1281,8 +1278,7 @@
a.SETTLE_TYPE as settleType, a.SETTLE_TYPE as settleType,
refund.CREATE_NAME as createName, refund.CREATE_NAME as createName,
a.POLICY_NO as policyNo, a.POLICY_NO as policyNo,
refund.REMARK as remark, refund.REMARK as remark,a.UNIT_NAME as unitName
a.IS_ADRESS as isAdress,a.UNIT_NAME as unitName
from from
t_insurance_detail a, t_insurance_detail a,
t_insurance_refund refund t_insurance_refund refund
......
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