FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_3' into develop_master

Browse Source
This commit is contained in:
yuezhihang
2022-01-12 11:44:48 +08:00
parent 4c13ee7c1d 8d7466b9d7
commit 7f44d04f0f
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java
+6
View File
@@ -14,6 +14,12 @@ import java.util.Date;
public class StandWarningEO extends EarlyWarningEO {
private static final long serialVersionUID = 1L;
@ExcelProperty("条款内容")
@ApiModelProperty("条款内容")
private String termsConditions;
@ExcelProperty("新车型实施日期")
@ApiModelProperty("新车型实施日期")
@DateTimeFormat(pattern = "YYYY-MM-dd")
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
+9 -2
View File
@@ -15,6 +15,7 @@
<result column="ITEMS_ID" property="itemsId"></result>
<result column="ITEMS_NUM" property="itemsNum"></result>
<result column="ITEMS_NAME" property="itemsName"></result>
<result column="TERMS_CONDITIONS" property="termsConditions"></result>
<result column="POLICY_ID" property="policyId"></result>
<result column="POLICY_NAME" property="policyName"></result>
<result column="MARK" property="mark"></result>
@@ -102,7 +103,9 @@
attr.CLLX AS APPLY_TYPE ,
attr.ZRGCS AS DUTY_ENGINEER ,
NULL AS ITEMS_ID ,
NULL AS ITEMS_NUM , NULL AS ITEMS_NAME ,
NULL AS ITEMS_NUM ,
NULL AS ITEMS_NAME ,
NULL AS TERMS_CONDITIONS,
NULL AS POLICY_ID ,
NULL AS POLICY_NAME ,
MARK ,
@@ -140,6 +143,7 @@
items.ID AS ITEMS_ID ,
items.ITEMS_NUM ,
items.ITEMS_NAME ,
items.TERMS_CONDITIONS,
NULL AS POLICY_ID ,
NULL AS POLICY_NAME ,
MARK ,
@@ -195,7 +199,9 @@
attr
.ZRGCS AS DUTY_ENGINEER ,
ITEMS_ID ,
NULL AS ITEMS_NUM , NULL AS ITEMS_NAME ,
NULL AS ITEMS_NUM ,
NULL AS ITEMS_NAME ,
NULL AS TERMS_CONDITIONS,
NULL AS POLICY_ID ,
NULL AS POLICY_NAME ,
MARK ,
@@ -239,6 +245,7 @@
items.ID AS ITEMS_ID ,
items.ITEMS_NUM ,
items.ITEMS_NAME ,
items.TERMS_CONDITIONS,
NULL AS POLICY_ID ,
NULL AS POLICY_NAME ,
MARK ,