Skip to content

A
amos-boot-biz
Commit 3fb6043e authored by 刘林's avatar 刘林
Browse files
Options

fix(jg):超设计使用年限功能开发

parent 488dfeb2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 118 additions and 5 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgOverDesignServiceLifeMapper.xml
View file @ 3fb6043e
...@@ -115,7 +115,14 @@ ...@@ -115,7 +115,14 @@
jri.EQU_CATEGORY as EQU_CATEGORY_CODE, jri.EQU_CATEGORY as EQU_CATEGORY_CODE,
jri.EQU_DEFINE as EQU_DEFINE_CODE, jri.EQU_DEFINE as EQU_DEFINE_CODE,
jfi.PRODUCE_DATE, jfi.PRODUCE_DATE,
to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = jui."RECORD" ORDER BY INSPECT_DATE DESC limit 1), 'YYYY-MM-DD') as NEXT_INSPECT_DATE (select SEQUENCE_NBR from idx_biz_jg_inspection_detection_info where "RECORD" = jui."RECORD" AND INSPECT_TYPE = 'WTJY' ORDER BY INSPECT_DATE DESC limit 1) jySeq,
(select INSPECT_ORG_NAME from idx_biz_jg_inspection_detection_info where "RECORD" = jui."RECORD" AND INSPECT_TYPE = 'WTJY' ORDER BY INSPECT_DATE DESC limit 1) INSPECT_ORG_NAME,
(select INSPECT_ORG_CODE from idx_biz_jg_inspection_detection_info where "RECORD" = jui."RECORD" AND INSPECT_TYPE = 'WTJY' ORDER BY INSPECT_DATE DESC limit 1) INSPECT_ORG_CODE,
(select INSPECT_REPORT_NO from idx_biz_jg_inspection_detection_info where "RECORD" = jui."RECORD" AND INSPECT_TYPE = 'WTJY' ORDER BY INSPECT_DATE DESC limit 1) INSPECT_REPORT_NO,
(select INSPECT_CONCLUSION from idx_biz_jg_inspection_detection_info where "RECORD" = jui."RECORD" AND INSPECT_TYPE = 'WTJY' ORDER BY INSPECT_DATE DESC limit 1) INSPECT_CONCLUSION_CODE,
(select name from cb_data_dictionary where type = 'JYJL' and code = (select INSPECT_CONCLUSION from idx_biz_jg_inspection_detection_info where "RECORD" = jui."RECORD" AND INSPECT_TYPE = 'WTJY' ORDER BY INSPECT_DATE DESC limit 1)) INSPECT_CONCLUSION,
to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = jui."RECORD" AND INSPECT_TYPE = 'WTJY' ORDER BY INSPECT_DATE DESC limit 1), 'YYYY-MM-DD') NEXT_INSPECT_DATE,
(select INSPECT_REPORT from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" AND INSPECT_TYPE = 'WTJY' ORDER BY INSPECT_DATE DESC limit 1) INSPECT_REPORT
FROM idx_biz_jg_use_info jui FROM idx_biz_jg_use_info jui
LEFT JOIN idx_biz_jg_factory_info jfi on jui.RECORD = jfi.RECORD LEFT JOIN idx_biz_jg_factory_info jfi on jui.RECORD = jfi.RECORD
LEFT JOIN idx_biz_jg_register_info jri on jui.RECORD = jri.RECORD LEFT JOIN idx_biz_jg_register_info jri on jui.RECORD = jri.RECORD
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java
View file @ 3fb6043e
...@@ -985,6 +985,7 @@ public class CommonServiceImpl implements ICommonService { ...@@ -985,6 +985,7 @@ public class CommonServiceImpl implements ICommonService {
map.put("excelType", Optional.ofNullable(map.get("excelType")).orElse("使用登记").toString()); // 发证日期-日 map.put("excelType", Optional.ofNullable(map.get("excelType")).orElse("使用登记").toString()); // 发证日期-日
map.put("tableName", Optional.ofNullable(map.get("tableName")).orElse("特种设备使用登记证").toString()); // 发证日期-日 map.put("tableName", Optional.ofNullable(map.get("tableName")).orElse("特种设备使用登记证").toString()); // 发证日期-日
map.put("carNumber", Optional.ofNullable(map.get("carNumber")).orElse("").toString()); // 车牌号 map.put("carNumber", Optional.ofNullable(map.get("carNumber")).orElse("").toString()); // 车牌号
map.put("overDesign", Optional.ofNullable(map.get("overDesign")).orElse("").toString()); // 超设计使用年限
// 生成二维码,之前为设备监管码，调整为证编号 // 生成二维码,之前为设备监管码，调整为证编号
String qrCode = ImageUtils.generateQRCode(getEncodeQrCode(Optional.ofNullable(map.get("certificateNo")).orElse("").toString(), "useCert", Optional.ofNullable(map.get("version")).orElse("").toString()), 100, 100); String qrCode = ImageUtils.generateQRCode(getEncodeQrCode(Optional.ofNullable(map.get("certificateNo")).orElse("").toString(), "useCert", Optional.ofNullable(map.get("version")).orElse("").toString()), 100, 100);
map.put("supervisoryCode", qrCode); // 监管二维码 map.put("supervisoryCode", qrCode); // 监管二维码
...@@ -1044,8 +1045,8 @@ public class CommonServiceImpl implements ICommonService { ...@@ -1044,8 +1045,8 @@ public class CommonServiceImpl implements ICommonService {
// Populate template variables with default values if not present // Populate template variables with default values if not present
String[] keys = {"useRegistrationCode", "useUnitName", "fullAddress", "equList", "equipDefine", "equipCode", String[] keys = {"useRegistrationCode", "useUnitName", "fullAddress", "equList", "equipDefine", "equipCode",
"equipCategory", "useInnerCode", "factoryNum", "receiveOrgName", "giveOutYear", "equipCategory", "useInnerCode", "factoryNum", "receiveOrgName", "giveOutYear",
"giveOutMonth", "giveOutDay", "excelType", "tableName", "carNumber"}; "giveOutMonth", "giveOutDay", "excelType", "tableName", "carNumber", "overDesign"};
String[] defaultValues = {"", "", "", "", "", "", "", "", "", "", "", "", "", "", "使用登记", "特种设备使用登记证"}; String[] defaultValues = {"", "", "", "", "", "", "", "", "", "", "", "", "", "", "使用登记", "特种设备使用登记证", ""};
for (int i = 0; i < keys.length; i++) { for (int i = 0; i < keys.length; i++) {
map.put(keys[i], Optional.ofNullable(map.get(keys[i])).orElse(defaultValues[i]).toString()); map.put(keys[i], Optional.ofNullable(map.get(keys[i])).orElse(defaultValues[i]).toString());
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/equipment-registration-certificate-report.ftl
View file @ 3fb6043e
...@@ -871,7 +871,7 @@ ...@@ -871,7 +871,7 @@
<w:sz w:val="24"/> <w:sz w:val="24"/>
</w:rPr> </w:rPr>
<w:pict> <w:pict>
<v:shape id="文本框 20" o:spid="_x0000_s1029" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:254.45pt;margin-top:132.1pt;height:37.5pt;width:205.5pt;z-index:251678720;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600"> <v:shape id="文本框 20" o:spid="_x0000_s1029" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:254.45pt;margin-top:132.1pt;height:20.5pt;width:165.5pt;z-index:251678720;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:path/> <v:path/>
<v:fill on="t" color2="#FFFFFF" focussize="0,0"/> <v:fill on="t" color2="#FFFFFF" focussize="0,0"/>
<v:stroke on="f" weight="0.5pt"/> <v:stroke on="f" weight="0.5pt"/>
...@@ -2957,6 +2957,41 @@ zl/OZWMbAAAAAIAowjYAAAAAAFGEbQAAAAAAovwPNj8bRIboD6oAAAAASUVORK5CYII= ...@@ -2957,6 +2957,41 @@ zl/OZWMbAAAAAIAowjYAAAAAAFGEbQAAAAAAovwPNj8bRIboD6oAAAAASUVORK5CYII=
<w:sz w:val="24"/> <w:sz w:val="24"/>
</w:rPr> </w:rPr>
<w:pict> <w:pict>
<v:shape id="文本框 8" o:spid="_x0000_s1045" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:254.45pt;margin-top:155.5pt;height:25.3pt;width:104.55pt;z-index:251666432;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:path/>
<v:fill on="t" color2="#FFFFFF" focussize="0,0"/>
<v:stroke on="f" weight="0.5pt"/>
<v:imagedata o:title=""/>
<o:lock v:ext="edit" aspectratio="f"/>
<v:textbox>
<w:txbxContent>
<w:p>
<w:pPr>
<w:rPr>
<w:rFonts w:hint="default"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
<w:spacing w:val="0"/>
<w:sz w:val="24"/>
<w:sz-cs w:val="24"/>
</w:rPr>
<w:t>${(overDesign)!''}</w:t>
</w:r>
</w:p>
</w:txbxContent>
</v:textbox>
</v:shape>
</w:pict>
</w:r>
<w:r>
<w:rPr>
<w:sz w:val="24"/>
</w:rPr>
<w:pict>
<v:shape id="文本框 7" o:spid="_x0000_s1046" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:33.8pt;margin-top:54.65pt;height:37.35pt;width:464.85pt;z-index:251660288;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600"> <v:shape id="文本框 7" o:spid="_x0000_s1046" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:33.8pt;margin-top:54.65pt;height:37.35pt;width:464.85pt;z-index:251660288;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:path/> <v:path/>
<v:fill on="t" color2="#FFFFFF" focussize="0,0"/> <v:fill on="t" color2="#FFFFFF" focussize="0,0"/>
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/unit-registration-certificate-report.ftl
View file @ 3fb6043e
...@@ -519,7 +519,7 @@ ...@@ -519,7 +519,7 @@
</w:rPr> </w:rPr>
<w:pict> <w:pict>
<v:shape id="文本框 20" o:spid="_x0000_s1027" o:spt="202" type="#_x0000_t202" <v:shape id="文本框 20" o:spid="_x0000_s1027" o:spt="202" type="#_x0000_t202"
style="position:absolute;left:0pt;margin-left:254.45pt;margin-top:132.1pt;height:37.5pt;width:205.5pt;z-index:251678720;mso-width-relative:page;mso-height-relative:page;" style="position:absolute;left:0pt;margin-left:254.45pt;margin-top:132.1pt;height:20.5pt;width:205.5pt;z-index:251678720;mso-width-relative:page;mso-height-relative:page;"
fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600"> fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:path/> <v:path/>
<v:fill on="t" color2="#FFFFFF" focussize="0,0"/> <v:fill on="t" color2="#FFFFFF" focussize="0,0"/>
...@@ -1845,6 +1845,41 @@ zl/OZWMbAAAAAIAowjYAAAAAAFGEbQAAAAAAovwPNj8bRIboD6oAAAAASUVORK5CYII= ...@@ -1845,6 +1845,41 @@ zl/OZWMbAAAAAIAowjYAAAAAAFGEbQAAAAAAovwPNj8bRIboD6oAAAAASUVORK5CYII=
<w:sz w:val="24"/> <w:sz w:val="24"/>
</w:rPr> </w:rPr>
<w:pict> <w:pict>
<v:shape id="文本框 8" o:spid="_x0000_s1045" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:254.45pt;margin-top:155.5pt;height:25.3pt;width:104.55pt;z-index:251666432;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:path/>
<v:fill on="t" color2="#FFFFFF" focussize="0,0"/>
<v:stroke on="f" weight="0.5pt"/>
<v:imagedata o:title=""/>
<o:lock v:ext="edit" aspectratio="f"/>
<v:textbox>
<w:txbxContent>
<w:p>
<w:pPr>
<w:rPr>
<w:rFonts w:hint="default"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
<w:spacing w:val="0"/>
<w:sz w:val="24"/>
<w:sz-cs w:val="24"/>
</w:rPr>
<w:t>${(overDesign)!''}</w:t>
</w:r>
</w:p>
</w:txbxContent>
</v:textbox>
</v:shape>
</w:pict>
</w:r>
<w:r>
<w:rPr>
<w:sz w:val="24"/>
</w:rPr>
<w:pict>
<v:shape id="文本框 7" o:spid="_x0000_s1040" o:spt="202" type="#_x0000_t202" <v:shape id="文本框 7" o:spid="_x0000_s1040" o:spt="202" type="#_x0000_t202"
style="position:absolute;left:0pt;margin-left:33.8pt;margin-top:54.65pt;height:37.35pt;width:464.85pt;z-index:251660288;mso-width-relative:page;mso-height-relative:page;" style="position:absolute;left:0pt;margin-left:33.8pt;margin-top:54.65pt;height:37.35pt;width:464.85pt;z-index:251660288;mso-width-relative:page;mso-height-relative:page;"
fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600"> fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/use-registration-model.ftl
View file @ 3fb6043e
...@@ -1484,6 +1484,41 @@ ...@@ -1484,6 +1484,41 @@
</v:shape> </v:shape>
</w:pict> </w:pict>
</w:r> </w:r>
<w:r>
<w:rPr>
<w:sz w:val="24"/>
</w:rPr>
<w:pict>
<v:shape id="文本框 8" o:spid="_x0000_s1045" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:254.45pt;margin-top:155.5pt;height:25.3pt;width:104.55pt;z-index:251666432;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:path/>
<v:fill on="t" color2="#FFFFFF" focussize="0,0"/>
<v:stroke on="f" weight="0.5pt"/>
<v:imagedata o:title=""/>
<o:lock v:ext="edit" aspectratio="f"/>
<v:textbox>
<w:txbxContent>
<w:p>
<w:pPr>
<w:rPr>
<w:rFonts w:hint="default"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
<w:spacing w:val="0"/>
<w:sz w:val="24"/>
<w:sz-cs w:val="24"/>
</w:rPr>
<w:t>${(overDesign)!''}</w:t>
</w:r>
</w:p>
</w:txbxContent>
</v:textbox>
</v:shape>
</w:pict>
</w:r>
</w:p> </w:p>
<w:sectPr> <w:sectPr>
<w:pgSz w:w="11906" w:h="16838"/> <w:pgSz w:w="11906" w:h="16838"/>
......
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