修改审查功能

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/zymlapplication/MyExamineController.java

@@ -57,7 +57,6 @@ public class MyExamineController extends BaseController {
         if (record == null) {
             return AjaxResult.error("查无此记录");
         }
-
         if (record.getState() == 3 || record.getState() == 4 || record.getState() == 2) {
             return AjaxResult.error("无法审核");
         }
@@ -70,7 +69,7 @@ public class MyExamineController extends BaseController {
         newRecord.setSpTime(new Date());
         newRecord.setDeadline(tZymlApplicationRecord.getDeadline());
         newRecord.setSpReason(tZymlApplicationRecord.getSpReason());
-        newRecord.setZymlUrl(myExamineService.getProxyServerUrl(fwKey, record.getSqFw()));
+        newRecord.setZymlUrl(myExamineService.getProxyServerUrl(fwKey, record.getZymlId()));
         return toAjax(zymlApplicationRecordService.updateTZymlApplicationRecord(newRecord));
     }
 

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/zymlapplication/TZymlApplicationRecord.java

@@ -153,6 +153,8 @@ public class TZymlApplicationRecord extends BaseEntity {
      * $column.columnComment
      */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date spTime;
 
     /**

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/zymlapplication/TMyExamineMapper.java

@@ -3,12 +3,12 @@ package com.onemap.apply.mapper.zymlapplication;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
 import java.util.Map;
 
 @Mapper
 public interface TMyExamineMapper {
 
-    @MapKey("bsm")
-    Map<String, Object> queryFwInfoByBsm(String bsm);
+   Map<String, Object> queryFwInfoByBsm(String bsm);
 
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/zymlapplication/MyExamineServiceImpl.java

@@ -31,8 +31,8 @@ public class MyExamineServiceImpl implements IMyExamineService {
             String qpfa = (String) mapfwData.get("qpfa");
             String layergroup = (String) mapfwData.get("layergroup");
             String format = (String) mapfwData.get("format");
-            String maximumlevel = (String) mapfwData.get("maximumlevel");
-            String minimumlevel = (String) mapfwData.get("minimumlevel");
+            Integer maximumlevel = (Integer) mapfwData.get("maximumlevel");
+            Integer minimumlevel = (Integer) mapfwData.get("minimumlevel");
             String params = "";
             params = params + paroxy_url.replace("{token}", fwKey) + "siweigeoserver" + "?";
             params = params + paramsTogether("server_type", type, true);
@@ -41,8 +41,8 @@ public class MyExamineServiceImpl implements IMyExamineService {
             params = params + paramsTogether("qpfa", qpfa, true);
             params = params + paramsTogether("layergroup", layergroup, true);
             params = params + paramsTogether("format", format, true);
-            params = params + paramsTogether("maximumlevel", maximumlevel, true);
-            params = params + paramsTogether("minimumlevel", minimumlevel, false);
+            params = params + paramsTogether("maximumlevel", String.valueOf(maximumlevel), true);
+            params = params + paramsTogether("minimumlevel", String.valueOf(minimumlevel), false);
             return params;
         } else {
             //判断3DTiles

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/zymlapplication/TZymlApplicationRecordMapper.xml

@@ -146,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="state != null">state = #{state},</if>
             <if test="sqRevokeTime != null">sq_revoke_time = #{sqRevokeTime},</if>
             <if test="sqRevokeReason != null  and sqRevokeReason != '' ">sq_revoke_reason = #{sqRevokeReason},</if>
+            <if test="zymlUrl != null  and zymlUrl != '' ">zyml_url = #{zymlUrl},</if>
         </trim>
         where id = #{id}
     </update>