diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 0000000..0e0e905 --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,16 @@ + + + + + java.sql.Driver + true + true + oracle.jdbc.driver.OracleDriver + jdbc:oracle:thin:@10.15.0.12:1521:orcl + + + + $ProjectFileDir$ + + + \ No newline at end of file diff --git a/src/main/java/com/nmgs/entity/WhiteAccountText.java b/src/main/java/com/nmgs/entity/WhiteAccountText.java index 8a9e482..cfb33cf 100644 --- a/src/main/java/com/nmgs/entity/WhiteAccountText.java +++ b/src/main/java/com/nmgs/entity/WhiteAccountText.java @@ -14,7 +14,7 @@ import java.util.Date; @Data @AllArgsConstructor @NoArgsConstructor -@TableName("WHITE_ACCOUNT_TEXT") +@TableName("CARNO_ACOUNT_TEXT") public class WhiteAccountText { @TableField("ACOUNTID") private int acountid; diff --git a/src/main/java/com/nmgs/entity/WhiteCarnoDic.java b/src/main/java/com/nmgs/entity/WhiteCarnoDic.java index c39f6ce..7920a16 100644 --- a/src/main/java/com/nmgs/entity/WhiteCarnoDic.java +++ b/src/main/java/com/nmgs/entity/WhiteCarnoDic.java @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor -@TableName("WHITE_CARNO_DIC_TABLE") +@TableName("CARNO_DIC_TABLE") public class WhiteCarnoDic { @TableField("MEMO") private String memo; diff --git a/src/main/java/com/nmgs/entity/WhiteCarnoList.java b/src/main/java/com/nmgs/entity/WhiteCarnoList.java index 4e0f922..96ff201 100644 --- a/src/main/java/com/nmgs/entity/WhiteCarnoList.java +++ b/src/main/java/com/nmgs/entity/WhiteCarnoList.java @@ -14,9 +14,9 @@ import java.util.Date; @Data @AllArgsConstructor @NoArgsConstructor -@TableName("WHITE_CARNO_TABLE") +@TableName("CARNO_TABLE") public class WhiteCarnoList { - @TableId(type = IdType.AUTO) + @TableField(exist = false) private String id; @TableField("ACARNO") private String acarno; @@ -31,8 +31,8 @@ public class WhiteCarnoList { @TableField("ENDDT") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date enddt; - @TableField("VEHICLE_TYPE") - private int vehicleType; + @TableField("FREEROAD") + private int freeRoad; @TableField("DATAFLAG") private String dataflag; @TableField("DESCRIB") @@ -44,16 +44,8 @@ public class WhiteCarnoList { private int account; @TableField("VERNO") private String verno; - @TableField("BAK1") - private String bak1; - @TableField("BAK2") - private String bak2; - @TableField("BAK3") - private String bak3; @TableField("MEMO") private String memo; - @TableField("VEHICLE_CLASS") - private int vehicleClass; @TableField("DISCRP") private String discrp; @TableField(exist = false) @@ -62,10 +54,8 @@ public class WhiteCarnoList { private String flagName; @TableField(exist = false) private String accountName; - @TableField(exist = false) - private String vehicleClassName; - @TableField(exist = false) - private String vehicleTypeName; + @TableField(exist = false) + private String freeRoadName; @TableField(exist = false) private String promperty; @TableField(exist = false) diff --git a/src/main/java/com/nmgs/entity/WhiteCarnoListDto.java b/src/main/java/com/nmgs/entity/WhiteCarnoListDto.java index f6595d9..1e69024 100644 --- a/src/main/java/com/nmgs/entity/WhiteCarnoListDto.java +++ b/src/main/java/com/nmgs/entity/WhiteCarnoListDto.java @@ -65,13 +65,13 @@ public class WhiteCarnoListDto { borderLeft = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) private Date enddt; - @ExcelProperty("类型") + @ExcelProperty("免费类型") @ColumnWidth(10) @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER, borderBottom = BorderStyleEnum.THIN, borderLeft = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) - private String vehicleClassName; + private String freeRoadName; @ExcelProperty("状态") @ColumnWidth(10) @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER, @@ -79,14 +79,6 @@ public class WhiteCarnoListDto { borderLeft = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) private String flagName; - @ExcelProperty("车型") - @ExcelIgnore - @ColumnWidth(10) - @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER, - borderBottom = BorderStyleEnum.THIN, - borderLeft = BorderStyleEnum.THIN, - borderRight = BorderStyleEnum.THIN) - private int vehicleName; @ExcelProperty("状态码") @ExcelIgnore @ColumnWidth(10) diff --git a/src/main/java/com/nmgs/entity/WhiteCarnoLogTable.java b/src/main/java/com/nmgs/entity/WhiteCarnoLogTable.java index 8403cfa..0650a82 100644 --- a/src/main/java/com/nmgs/entity/WhiteCarnoLogTable.java +++ b/src/main/java/com/nmgs/entity/WhiteCarnoLogTable.java @@ -14,7 +14,7 @@ import java.util.Date; @Data @AllArgsConstructor @NoArgsConstructor -@TableName("WHITE_CARNO_LOG_TABLE") +@TableName("CARNO_TABLE_LOG") public class WhiteCarnoLogTable { @TableId(type = IdType.INPUT) private String id; @@ -31,8 +31,8 @@ public class WhiteCarnoLogTable { @TableField("ENDDT") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date enddt; - @TableField("VEHICLE_TYPE") - private int vehicleType; + @TableField("FREEROAD") + private int freeRoad; @TableField("DATAFLAG") private String dataflag; @TableField("DESCRIB") @@ -52,8 +52,6 @@ public class WhiteCarnoLogTable { private String bak3; @TableField("MEMO") private String memo; - @TableField("VEHICLE_CLASS") - private int vehicleClass; @TableField(exist = false) private String flagName; @TableField(exist = false) @@ -79,5 +77,7 @@ public class WhiteCarnoLogTable { private String comno="test"; @TableField("IDBUSINESS") private String idbusiness; + @TableField(exist = false) + private String freeRoadName; } diff --git a/src/main/java/com/nmgs/entity/WhiteComnoText.java b/src/main/java/com/nmgs/entity/WhiteComnoText.java index 1a8ea6d..f8475a1 100644 --- a/src/main/java/com/nmgs/entity/WhiteComnoText.java +++ b/src/main/java/com/nmgs/entity/WhiteComnoText.java @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor -@TableName("white_account_text") +@TableName("CARNO_ACOUNT_TEXT") public class WhiteComnoText { @TableField("VALUE") private String value; diff --git a/src/main/java/com/nmgs/mapper/WhiteAccountMapper.xml b/src/main/java/com/nmgs/mapper/WhiteAccountMapper.xml index 2f3e5e8..c2c9cd2 100644 --- a/src/main/java/com/nmgs/mapper/WhiteAccountMapper.xml +++ b/src/main/java/com/nmgs/mapper/WhiteAccountMapper.xml @@ -7,7 +7,7 @@ - update WHITE_ACCOUNT_TEXT + update CARNO_ACOUNT_TEXT acountname=#{params.acountname}, where acountid=#{params.acountid} - insert into WHITE_ACCOUNT_TEXT(VALUE,TEXT) values(#{params.acountid},#{params.text}) + insert into CARNO_ACOUNT_TEXT(acountid,acountname) values(#{params.acountid},#{params.text}) - DELETE FROM WHITE_ACCOUNT_TEXT WHERE acountid IN + DELETE FROM CARNO_ACOUNT_TEXT WHERE acountid IN #{str} @@ -37,7 +37,7 @@ select t.memo,t.discrp,t.dicname,t.unuser1,t.unuser2 - FROM WHITE_CARNO_DIC_TABLE t + FROM CARNO_DIC_TABLE t AND t.memo = #{params.memo} @@ -19,10 +19,10 @@ - insert into WHITE_CARNO_DIC_TABLE(memo,discrp,dicname) values(#{params.memo},#{params.discrp},#{params.dicname}) + insert into CARNO_DIC_TABLE(memo,discrp,dicname) values(#{params.memo},#{params.discrp},#{params.dicname}) - DELETE FROM WHITE_CARNO_DIC_TABLE WHERE memo IN + DELETE FROM CARNO_DIC_TABLE WHERE memo IN #{str} @@ -30,7 +30,7 @@ select - t.id,t.acarno,t.COLOR,t.DT,t.BEGDT,t.ENDDT, - t.VEHICLE_TYPE,t.DATAFLAG,t.DESCRIB,t.BEGDATE, - t.ACCOUNT,t.VERNO,t.bak1,t.bak2,t.bak3,t.memo,t.VEHICLE_CLASS,t.DISCRP, + CONCAT(ACARNO,COLOR) as id, + t.acarno,t.COLOR,t.DT,t.BEGDT,t.ENDDT, + t.DATAFLAG,t.DESCRIB,t.BEGDATE,t.FREEROAD, + t.ACCOUNT,t.VERNO,t.memo,t.DISCRP, (case when t.ENDDT< dateadd(day,0,#{params.CURRENTDATE}) THEN '已过期' when t.ENDDT <= dateadd(day,0,#{params.CURRENTWILLDATE}) THEN '将到期' @@ -33,14 +34,15 @@ else '正常' end) AS promperty, (case when t.DATAFLAG='1' then '在用' else '停用' end) as flagName, - wct.acountname as accountName,wpc.text as colorName,wvc.text as vehicleClassName,'' as vehicleTypeName - FROM WHITE_CARNO_TABLE t - left join white_ACCOUNT_text wct on(t.ACCOUNT = wct.acountid) + wct.acountname as accountName,wpc.text as colorName,ft.TEXT as freeRoadName + FROM CARNO_TABLE t + left join CARNO_ACOUNT_TEXT wct on(t.ACCOUNT = wct.acountid) left join white_plate_color wpc on(t.COLOR = wpc.value) - left join WHITE_VEHICLE_CLASS wvc on(t.VEHICLE_CLASS = wvc.value) + left join FREEROAD_TEXT ft on(t.FREEROAD = ft.value) + - AND t.id = #{params.id} + AND CONCAT(ACARNO,COLOR) = #{params.id} @@ -224,13 +226,11 @@ order by t.DT desc,t.acarno - update WHITE_CARNO_TABLE + update CARNO_TABLE - ACARNO=#{params.acarno}, - COLOR=#{params.color}, BEGDT= #{params.begdt}, ENDDT= #{params.enddt}, - VEHICLE_TYPE=#{params.vehicleType} , + FREEROAD=#{params.freeRoad} , DATAFLAG= #{params.dataflag}, DESCRIB= #{params.describ}, BEGDATE= #{params.begdate}, @@ -238,28 +238,17 @@ VERNO= #{params.verno}, - - BAK1= #{params.bak1}, - - - BAK2= #{params.bak12}, - - - BAK3= #{params.bak3}, - DISCRP= #{params.discrp}, - - VEHICLE_CLASS=#{params.vehicleClass}, - MEMO= #{params.memo} - where ID=#{params.id} + where ACARNO=#{params.acarno} AND + COLOR=#{params.color} - update WHITE_CARNO_TABLE + update CARNO_TABLE BEGDT = dateadd(day,0,#{params.begdt}), @@ -280,13 +269,14 @@ DATAFLAG= #{params.dataflag}, ACCOUNT= #{params.account} - where ID IN + where + CONCAT(ACARNO,COLOR) in #{str} - update WHITE_CARNO_TABLE + update CARNO_TABLE BEGDATE = dateadd(day,0,#{params.begdate}) @@ -305,49 +295,44 @@ - insert into WHITE_CARNO_TABLE(ID, + insert into CARNO_TABLE( acarno, COLOR, - DT,BEGDT,ENDDT, - VEHICLE_TYPE, + DT,BEGDT,ENDDT,FREEROAD, DATAFLAG,DESCRIB,BEGDATE,ACCOUNT,VERNO, - BAK1,BAK2,BAK3,MEMO, - VEHICLE_CLASS,DISCRP) - values(#{params.id}, - #{params.acarno}, + MEMO, + DISCRP) + values( #{params.acarno}, #{params.color}, #{params.dt}, #{params.begdt}, #{params.enddt}, #{params.vehicleType}, #{params.dataflag},#{params.describ},#{params.begdate}, - #{params.account},#{params.verno},#{params.bak1}, - #{params.bak2},#{params.bak3},#{params.memo}, - #{params.vehicleClass},#{params.discrp} + #{params.account},#{params.verno},#{params.memo},#{params.discrp} ) - insert into WHITE_CARNO_TABLE(ID,acarno,COLOR,DT,BEGDT,ENDDT,VEHICLE_TYPE, - DATAFLAG,DESCRIB,BEGDATE,ACCOUNT,VERNO,BAK1,BAK2,BAK3,MEMO, - VEHICLE_CLASS,DISCRP) values + insert into CARNO_TABLE(acarno,COLOR,DT,BEGDT,ENDDT,FREEROAD, + DATAFLAG,DESCRIB,BEGDATE,ACCOUNT,VERNO,MEMO,,DISCRP) values - (#{params.id},#{params.acarno},#{params.color},#{params.dt},#{params.begdt}, + (#{params.acarno},#{params.color},#{params.dt},#{params.begdt}, #{params.enddt},#{params.vehicleType},#{params.dataflag},#{params.describ},#{params.begdate}, - #{params.account},#{params.verno},#{params.bak1},#{params.bak2},#{params.bak3},#{params.memo},#{params.vehicleClass},#{params.discrp} + #{params.account},#{params.verno},#{params.memo},#{params.discrp} ) - DELETE FROM WHITE_CARNO_TABLE WHERE ID IN + DELETE FROM CARNO_TABLE WHERE CONCAT(ACARNO,COLOR) IN #{str} select max(t.VERNO) as verno - FROM WHITE_CARNO_TABLE t + FROM CARNO_TABLE t ${params.whereSql} diff --git a/src/main/java/com/nmgs/mapper/WhiteCarnoLogMapper.xml b/src/main/java/com/nmgs/mapper/WhiteCarnoLogMapper.xml index 8f323b8..ddccb72 100644 --- a/src/main/java/com/nmgs/mapper/WhiteCarnoLogMapper.xml +++ b/src/main/java/com/nmgs/mapper/WhiteCarnoLogMapper.xml @@ -5,14 +5,14 @@ - insert into WHITE_CARNO_LOG_TABLE(ID,acarno,COLOR,DT,BEGDT,ENDDT,VEHICLE_TYPE, + insert into CARNO_TABLE_LOG(ID,acarno,COLOR,DT,BEGDT,ENDDT,FREEROAD, STATUS,DESCRIB,BEGDATE,ACCOUNT,VERNO,BAK1,BAK2,BAK3,MEMO, - VEHICLE_CLASS,OPERTYPE,OPERTYPENAME,OPERDATE,OPERMANO,OPERMANAME,COMNO,IDBUSINESS) + OPERTYPE,OPERTYPENAME,OPERDATE,OPERMANO,OPERMANAME,COMNO,IDBUSINESS) values (#{params.id},#{params.acarno},#{params.color},#{params.dt},#{params.begdt}, - #{params.enddt},#{params.vehicleType},#{params.dataflag},#{params.describ},#{params.begdate}, + #{params.enddt},#{params.freeRoad},#{params.dataflag},#{params.describ},#{params.begdate}, #{params.account},#{params.verno},#{params.bak1},#{params.bak2},#{params.bak3},#{params.memo}, - #{params.vehicleClass},#{params.opertype},#{params.opertypename},#{params.operdate}, + #{params.opertype},#{params.opertypename},#{params.operdate}, #{params.opermano},#{params.opermaname},#{params.comno},#{params.idbusiness} ) @@ -21,15 +21,15 @@