skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml
@@ -56,7 +56,7 @@ <select id="selectReportFloodRecordPages" resultMap="vo"> SELECT R.*, SELECT R.*,arfl."tb_flse_lim_stag" tbFlseLimStag,r.main_z - arfl."tb_flse_lim_stag" mainBe,r.person_rz - arfl."tb_flse_lim_stag" personBe, arb."name" reservoirName , arb."res_reg_code" as resRegCode, @@ -88,6 +88,7 @@ LEFT JOIN SJZT_MD."att_ad_base" county ON town."p_ad_code" = county."guid" LEFT JOIN SJZT_MD."att_ad_base" city ON county."p_ad_code" = city."guid" LEFT JOIN SJZT_MD."att_ad_base" province ON province."guid" = city."p_ad_code" left join sjzt_md."att_res_flse_lim" arfl on arfl."res_guid" = arb."guid" and arfl."is_use" = 1 WHERE r.is_deleted = 0 <if test=" reportFloodRecord.adCode!= null and reportFloodRecord.adCode !='' "> @@ -103,13 +104,22 @@ AND r.reservoir_id = #{reportFloodRecord.reservoirId} </if> <if test="reportFloodRecord.startTime !=null and reportFloodRecord.startTime !=''"> AND DATE_FORMAT(r.create_time,'%Y-%m-%d') >= #{reportFloodRecord.startTime} AND DATE_FORMAT(r.report_time,'%Y-%m-%d') >= #{reportFloodRecord.startTime} </if> <if test="reportFloodRecord.endTime !=null and reportFloodRecord.endTime !=''"> AND DATE_FORMAT(r.create_time,'%Y-%m-%d') <= #{reportFloodRecord.endTime} AND DATE_FORMAT(r.report_time,'%Y-%m-%d') <= #{reportFloodRecord.endTime} </if> <if test="reportFloodRecord.createUser !=null and reportFloodRecord.createUser !=''"> AND r.create_user = #{reportFloodRecord.createUser} </if> <if test="reportFloodRecord.isOver !=null and reportFloodRecord.isOver !=''"> AND r.is_over = #{reportFloodRecord.isOver} </if> <if test="reportFloodRecord.isStatus !=null and reportFloodRecord.isStatus !=''"> AND r.status = #{reportFloodRecord.isStatus} </if> <if test="reportFloodRecord.gateStatus !=null and reportFloodRecord.gateStatus !=''"> AND r.gate_status = #{reportFloodRecord.gateStatus} </if> <if test="reportFloodRecord.resRegCode != null and reportFloodRecord.resRegCode != ''"> @@ -123,7 +133,7 @@ </if> ORDER BY CREATE_TIME DESC --ORDER BY CREATE_TIME DESC </select> <select id="customizeGetDetail" resultMap="vo">
@@ -36,4 +36,9 @@ private String lon; private String lat; private String isStatus;//是否异常 private Double tbFlseLimStag;//汛限水位 private Double mainBe;//主站比汛限 private Double personBe;//人工报讯比汛限水位 } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/dto/TbProjectIsfillDTO.java
@@ -14,11 +14,11 @@ private int isFil; @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date stratTime; @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/TbProjectIsfillVO.java
@@ -11,11 +11,11 @@ private int isFil; @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date stratTime; @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java
@@ -91,7 +91,7 @@ @GetMapping("/download/overFloodInfo") public ResponseEntity overFloodInfo(String isShow) throws Exception { String time = new SimpleDateFormat("yyyy日MM月dd日HH时").format(new Date()); String time = new SimpleDateFormat("yyyy年MM月dd日HH时").format(new Date()); String fileName = time + "报汛文件.docx"; String fileNameURL = URLEncoder.encode(fileName, "UTF-8"); //获取总览、大中库、明细数据 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/resources/word/doc/overFloodTemplate.docxBinary files differ
