fix(JG)：气瓶导入功能开发，标志添加日

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/converter/ChargingMediumConverter.java

@@ -17,10 +17,12 @@ public class ChargingMediumConverter implements Converter<String> {
         EXCEL_TO_JAVA_MAP.put("液化天然气", "LIQUEFIED_NATURAL_GAS");
         EXCEL_TO_JAVA_MAP.put("液化石油气", "LIQUEFIED_PETROLEUM_GAS");
         EXCEL_TO_JAVA_MAP.put("压缩天然气", "COMPRESSED_NATURAL_GAS");
+        EXCEL_TO_JAVA_MAP.put("氢气", "HYDROGEN");
 
         JAVA_TO_EXCEL_MAP.put("LIQUEFIED_NATURAL_GAS", "液化天然气");
         JAVA_TO_EXCEL_MAP.put("LIQUEFIED_PETROLEUM_GAS", "液化石油气");
         JAVA_TO_EXCEL_MAP.put("COMPRESSED_NATURAL_GAS", "压缩天然气");
+        JAVA_TO_EXCEL_MAP.put("HYDROGEN", "氢气");
     }
 
     @Override

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/IdxBizJqEquipmentRegisterController.java

@@ -168,7 +168,7 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
      * 压力容器设备模版下载
      */
     @GetMapping("/pressureVesselTemplate")
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(value = "压力容器设备模版下载")
     public void pressureVesselTemplate(HttpServletResponse response) throws Exception {
         response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("压力容器设备导入模版.xlsx", "UTF-8"));

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

@@ -470,9 +470,12 @@ public class CommonServiceImpl implements ICommonService {
 
     private void setNextDate(UseFlagParamDto useFlagParamDto, Map<String, Object> paramMap) {
         if (useFlagParamDto.getNextInspectionDate() != null) {
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(useFlagParamDto.getNextInspectionDate());
             paramMap.put("year", DateUtil.year(useFlagParamDto.getNextInspectionDate()) + "");
             paramMap.put("month", DateUtil.month(useFlagParamDto.getNextInspectionDate()) + 1);
-            paramMap.put("nextInspectionTime", paramMap.get("year") + "年" + paramMap.get("month") + "月");
+            paramMap.put("day", calendar.get(Calendar.DAY_OF_MONTH));
+            paramMap.put("nextInspectionTime", paramMap.get("year") + "年" + paramMap.get("month") + "月" + paramMap.get("day") + "日");
         }
     }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/flag3-use-equip.ftl

@@ -1671,6 +1671,24 @@
 														</w:rPr>
 														<w:t>月</w:t>
 													</w:r>
+													<w:r>
+														<w:rPr>
+															<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
+															<w:sz w:val="18"/>
+															<w:sz-cs w:val="18"/>
+															<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
+														</w:rPr>
+														<w:t>${(day)!''}</w:t>
+													</w:r>
+													<w:r>
+														<w:rPr>
+															<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
+															<w:sz w:val="18"/>
+															<w:sz-cs w:val="18"/>
+															<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
+														</w:rPr>
+														<w:t>日</w:t>
+													</w:r>
 												</w:p>
 											</w:txbxContent>
 										</v:textbox>