xit-app
/
fims-chongno
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://xit.xit-git.com:3000/xit-app/fims-chongno.git

Browse Source
master
김의진 1 month ago
parent 9576a3a148 1c482c49ed
commit 80096e5a65
8 changed files with 40 additions and 57 deletions
Show Stats Download Patch File Download Diff File

53
src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java
Unescape Escape View File

@ -127,42 +127,12 @@ public class ChongnoTaskProcessor extends TaskProcessor {
LevyExcl levyExcl = getLevyExcl(capacity, vhrno, crdn);
if (levyExcl != null)
excluded.put(crdn, levyExcl); // 정원초과 -> 계도(시범운영)
/*
int vhclCpct = crdn.getVhclCpct();
if (vhclCpct == 0) {
// 정원미확인 -> 초기상태
} else if (vhclCpct < capacity) // 정원미만
excluded.put(crdn, newLevyExcl(crdn, "1", "114"));
else if (vhclCpct >= capacity) {
boolean enforce = isTarget(vhrno, crdn);
if (enforce) {
excluded.put(crdn, newLevyExcl(crdn, "2", "206")); // 정원초과 -> 계도(시범운영)
} else
excluded.put(crdn, newLevyExcl(crdn, "1", "103")); // 부과제외(일반차량)
}
*/
}
return excluded;
}
/**차량이 승합차이고 일반 운수사업용인지 반환한다.
* @param vhrno Vhrno
* @param crdn 단속정보
* @return 차량이 승합차이고 일반 운수사업용인지 여부
private boolean isTarget(Vhrno vhrno, Crdn crdn) {
vhrno.setFullNumber(crdn.getVhrno());
return Vhrno.VAN.equals(vhrno.getVehicleType())
&& vhrno.isCommercial();
}
*/
private LevyExcl getLevyExcl(int capacity, Vhrno vhrno, Crdn crdn) {
int vhclCpct = crdn.getVhclCpct();
if (vhclCpct == 0) // 정원미확인 -> 초기상태
return null; //newLevyExcl(crdn, "1", "115");
if (vhrno == null)
vhrno = new Vhrno();
vhrno.setFullNumber(crdn.getVhrno());
@ -171,11 +141,14 @@ public class ChongnoTaskProcessor extends TaskProcessor {
boolean target =
Vhrno.VAN.equals(vhrno.getVehicleType())
&& vhrno.isCommercial();
if (!target)
return newLevyExcl(crdn, "1", "103"); // 부과제외(일반차량)
if (vhclCpct < capacity) // 정원미만
int vhclCpct = crdn.getVhclCpct();
if (vhclCpct == 0) // 정원미확인 -> 초기상태
return null; //newLevyExcl(crdn, "1", "115");
if (vhclCpct < capacity) // 부과제외(정원미만)
return newLevyExcl(crdn, "1", "114");
// 정원초과, 승합차, 운수사업 일반 -> 단속대상: 계도(시범운영)
@ -195,21 +168,5 @@ public class ChongnoTaskProcessor extends TaskProcessor {
return capacity != 0 ?
getLevyExcl(capacity, null, crdn) :
null;
/*
int vhclCpct = crdn.getVhclCpct();
if (vhclCpct == 0) // 정원미확인 -> 초기상태
return null; //newLevyExcl(crdn, "1", "115");
boolean target = isTarget(new Vhrno(), crdn);
if (vhclCpct < capacity) // 정원미만
return newLevyExcl(crdn, "1", "114");
boolean enforce = vhclCpct >= capacity && target;
if (enforce) // 정원초과, 승합차, 운수사업 일반 -> 단속대상: 계도(시범운영)
return newLevyExcl(crdn, "2", "206");
else
return newLevyExcl(crdn, "1", "103"); // 부과제외(일반차량)
*/
}
}

3
src/main/webapp/WEB-INF/jsp/fims/crdn/crdn-cctv.jsp
Unescape Escape View File

@ -162,7 +162,8 @@ let cctv = {
normal: 0,
malformed: 0,
success: 0,
duplicates: 0
duplicates: 0,
invalidPlace: 0
},
batches = getBatches(fileSet.getDataset(), keymapper);

3
src/main/webapp/WEB-INF/jsp/fims/crdn/crdn-local.jsp
Unescape Escape View File

@ -180,7 +180,8 @@ let localFiles = {
normal: 0,
malformed: 0,
success: 0,
duplicates: 0
duplicates: 0,
invalidPlace: 0
},
batches = getBatches(uploadSet.getDataset(), keymapper);

BIN
src/main/webapp/WEB-INF/report/img/prenotice-01.jpg
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 670 KiB

BIN
src/main/webapp/WEB-INF/report/img/prenotice-02.jpg
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 404 KiB

BIN
src/main/webapp/WEB-INF/report/img/prenotice-1.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 330 KiB

BIN
src/main/webapp/WEB-INF/report/prenotice-a4.jasper
View File

Binary file not shown.

38
src/main/webapp/WEB-INF/report/prenotice-a4.jrxml
Unescape Escape View File

@ -161,7 +161,7 @@
<element kind="frame" uuid="210f49b4-e1a7-468b-9b88-cc14cad7cf51" x="0" y="0" width="595" height="842">
<property name="com.jaspersoft.studio.unit.height" value="px"/>
<element kind="image" uuid="01c39ecb-dee4-4b92-a857-5abe67435573" x="0" y="0" width="595" height="842" linkType="None" linkTarget="Self">
<expression><![CDATA[($P{resDir} == null ? "." : $P{resDir}) + "/img/prenotice-1.jpg"]]></expression>
<expression><![CDATA[($P{resDir} == null ? "." : $P{resDir}) + "/img/prenotice-01.jpg"]]></expression>
<property name="com.jaspersoft.studio.unit.width" value="px"/>
<property name="com.jaspersoft.studio.unit.height" value="px"/>
<property name="com.jaspersoft.studio.unit.x" value="px"/>
@ -200,8 +200,9 @@
<element kind="textField" uuid="5ff866b5-c4a1-4ec7-9d2d-8b4bd25bb5af" x="211" y="360" width="105" height="10" fontName="굴림체" fontSize="8.0" blankWhenNull="true">
<expression><![CDATA[$F{CRDN_PLC}]]></expression>
</element>
<element kind="textField" uuid="e98d269b-20e7-4de2-9589-6eb11b67136c" x="211" y="376" width="103" height="12" fontName="굴림체" fontSize="8.0" blankWhenNull="true">
<element kind="textField" uuid="e98d269b-20e7-4de2-9589-6eb11b67136c" x="211" y="376" width="105" height="12" fontName="굴림체" fontSize="8.0" blankWhenNull="true">
<expression><![CDATA[$F{VLTN_ARTCL}]]></expression>
<property name="com.jaspersoft.studio.unit.width" value="px"/>
</element>
<element kind="textField" uuid="55e711a7-ea45-43c4-a2b6-8575fa69f047" x="211" y="331" width="103" height="12" fontName="굴림체" fontSize="8.0" linkType="None" linkTarget="Self" blankWhenNull="true">
<expression><![CDATA[$F{CRDN_YMD_TM}]]></expression>
@ -254,8 +255,9 @@
<element kind="textField" uuid="368d6da2-e000-4a23-b5ed-e5c67bccc782" x="65" y="438" width="79" height="12" fontName="굴림체" fontSize="8.0" pattern="#,##0원" blankWhenNull="true" hTextAlign="Right">
<expression><![CDATA[$F{LAST_AMT}]]></expression>
</element>
<element kind="textField" uuid="dfd69b4b-3991-45fb-aa14-b31bf25f7b4a" x="42" y="569" width="101" height="12" fontName="굴림체" fontSize="8.0" blankWhenNull="true">
<expression><![CDATA[$F{RTPYR_NM} + "(" + $F{VHRNO} + ")"]]></expression>
<element kind="textField" uuid="dfd69b4b-3991-45fb-aa14-b31bf25f7b4a" x="42" y="564" width="104" height="12" fontName="굴림체" fontSize="8.0" blankWhenNull="true">
<expression><![CDATA[$F{RTPYR_NM}]]></expression>
<property name="com.jaspersoft.studio.unit.width" value="px"/>
</element>
<element kind="textField" uuid="34d91775-e2fe-44be-adf3-896f9afcd5d4" x="41" y="596" width="108" height="12" fontName="굴림체" fontSize="8.0" blankWhenNull="true">
<expression><![CDATA[$F{EPAYNO}]]></expression>
@ -291,10 +293,11 @@
<element kind="textField" uuid="f2db2edf-e175-4a33-b737-4c0197316a6e" x="82" y="387" width="67" height="12" fontName="굴림체" fontSize="8.0" blankWhenNull="true">
<expression><![CDATA[$F{NXRP_LEVY_KEY}]]></expression>
</element>
<element kind="textField" uuid="dfc3b4f9-c41f-4e11-8a4f-a96d78b9538e" x="41" y="302" width="102" height="12" fontName="굴림체" fontSize="8.0" blankWhenNull="true">
<expression><![CDATA[$F{RTPYR_NM} + "(" + $F{VHRNO} + ")"]]></expression>
<element kind="textField" uuid="dfc3b4f9-c41f-4e11-8a4f-a96d78b9538e" x="41" y="298" width="105" height="12" fontName="굴림체" fontSize="8.0" linkType="None" linkTarget="Self" blankWhenNull="true">
<expression><![CDATA[$F{RTPYR_NM}]]></expression>
<property name="com.jaspersoft.studio.unit.width" value="px"/>
</element>
<element kind="textField" uuid="29b034f5-48e1-4020-85df-52bb910cc4c6" x="211" y="294" width="102" height="12" fontName="굴림체" fontSize="8.0" blankWhenNull="true">
<element kind="textField" uuid="29b034f5-48e1-4020-85df-52bb910cc4c6" x="211" y="294" width="275" height="12" fontName="굴림체" fontSize="8.0" blankWhenNull="true">
<expression><![CDATA[$F{RTPYR_NM} + "(" + $F{VHRNO} + ")"]]></expression>
</element>
<element kind="textField" uuid="43642b0a-d10b-402c-a669-dadd933d0165" x="82" y="365" width="67" height="12" fontName="굴림체" fontSize="8.0" blankWhenNull="true">
@ -354,7 +357,28 @@
<element kind="textField" uuid="43978bfd-3788-418f-8efa-f48b8f896f67" x="17" y="653" width="60" height="12" fontName="굴림체" fontSize="8.0" blankWhenNull="true">
<expression><![CDATA[$F{napbuYm}]]></expression>
</element>
<element kind="textField" uuid="47e4c72a-f7e0-41eb-abe6-309aea3fdea9" x="41" y="310" width="105" height="12" fontName="굴림체" fontSize="8.0" blankWhenNull="true">
<expression><![CDATA["(" + $F{VHRNO} + ")"]]></expression>
<property name="com.jaspersoft.studio.unit.width" value="px"/>
</element>
<element kind="textField" uuid="ca873a48-4060-485e-9233-9663313b4495" x="42" y="576" width="104" height="12" fontName="굴림체" fontSize="8.0" blankWhenNull="true">
<expression><![CDATA["(" + $F{VHRNO} + ")"]]></expression>
<property name="com.jaspersoft.studio.unit.width" value="px"/>
</element>
</element>
</band>
<band height="842">
<element kind="frame" uuid="b6db9691-77cb-43b6-8363-9e51004ace58" x="0" y="0" width="595" height="842">
<property name="com.jaspersoft.studio.unit.height" value="px"/>
<element kind="image" uuid="4f283fa6-3890-4cd6-8217-41c4aeaaebad" x="0" y="0" width="595" height="842" linkType="None" linkTarget="Self">
<expression><![CDATA[($P{resDir} == null ? "." : $P{resDir}) + "/img/prenotice-02.jpg"]]></expression>
<property name="com.jaspersoft.studio.unit.width" value="px"/>
<property name="com.jaspersoft.studio.unit.height" value="px"/>
<property name="com.jaspersoft.studio.unit.x" value="px"/>
<property name="com.jaspersoft.studio.unit.y" value="px"/>
</element>
</element>
<property name="com.jaspersoft.studio.unit.height" value="px"/>
</band>
</detail>
</jasperReport>

Write Preview
Loading…
Cancel
Save