最新代码提交

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/cggl/CgglController.java

@@ -71,6 +71,19 @@ public class CgglController extends BaseController {
         return res;
     }
 
+    /**
+     * 上传专项规划市级审查文件
+     *
+     * @param id
+     * @param fileurl
+     * @return
+     */
+    @PostMapping("/updateCgscFile")
+    public RequestResult updateCgscFile(String id, String fileurl) {
+        RequestResult res = cgglService.updateCgscFile(id, fileurl);
+        return res;
+    }
+
     /**
      * 查询成果上传列表
      *

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/ghss/ZbmxJcpgyjMapper.java

@@ -24,9 +24,9 @@ public interface ZbmxJcpgyjMapper extends BaseMapper<ZbmxZbxDTO> {
 
     List<ZbmxJcpgyjDTO> SelectGHZ(@Param("newidsList") String[] newidsList, @Param("xzqdm") String xzqdm);
 
-    ZbmxZbjczDTO SeletQSFX(@Param("xzqdm") String xzqdm, @Param("zbbh") String zbbh, @Param("jcsj") String jcsj);
+    List<ZbmxZbjczDTO> SeletQSFX(@Param("xzqdm") String xzqdm, @Param("zbbh") String zbbh, @Param("jcsj") String jcsj);
 
-    ZbmxZbjczDTO SelectHBFX(@Param("xzqdm") String xzqdm, @Param("zbbh") String zbbh, @Param("jcsj") String jcsj);
+    List<ZbmxZbjczDTO>  SelectHBFX(@Param("xzqdm") String xzqdm, @Param("zbbh") String zbbh, @Param("jcsj") String jcsj);
 
     double SelectGHMBZ(@Param("year") String year, @Param("xzqdm") String xzqdm, @Param("zbbh") String zbbh);
 

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/cggl/CgglService.java

@@ -60,4 +60,6 @@ public interface CgglService {
     RequestResult xbdelete(String id);
 
     RequestResult updateCgBaseInfo(HttpServletResponse response);
+
+    RequestResult updateCgscFile(String id, String fileurl);
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/cggl/CgglServiceImpl.java

@@ -209,7 +209,7 @@ public class CgglServiceImpl implements CgglService {
 //        }
             //TODO wanger 根据成果目录要求进行审查和记录
             String plantype = escalationDTO.getPlantype();
-            if (!"6".equals(plantype)) {
+            if (!"6".equals(plantype) && !"5".equals(plantype)) {
                 QueryWrapper<EscalationFileDTO> filewrapper = new QueryWrapper<EscalationFileDTO>();
                 filewrapper.eq("id", escalationDTO.getFileid());
                 EscalationFileDTO fileDto = escalationFileMapper.selectOne(filewrapper);
@@ -1139,6 +1139,16 @@ public class CgglServiceImpl implements CgglService {
         return RequestResult.success(String.format("共更新总体规划类型数据：%s条记录！共更新村庄规划类型数据：%s条记录！", ztghcount, czghcount));
     }
 
+    @Override
+    public RequestResult updateCgscFile(String id, String fileurl) {
+        QueryWrapper<EscalationDTO> wrapper = new QueryWrapper<EscalationDTO>();
+        wrapper.eq("id", id);
+        EscalationDTO dto = escalationMapper.selectOne(wrapper);
+        dto.setLoginfo(fileurl);
+        escalationMapper.update(dto, wrapper);
+        return RequestResult.success("上传成功！！");
+    }
+
     @Override
     public RequestResult xbfiledownload(String id, HttpServletResponse response) {
         if (StringUtils.isEmpty(id)) {

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/ghss/ZbmxJcpgyjServiceImpl.java

@@ -122,12 +122,12 @@ public class ZbmxJcpgyjServiceImpl implements IZbmxJcpgyjService {
         try {
             ZbmxJcpgyjTrendViewDTO res = new ZbmxJcpgyjTrendViewDTO();
             //监测值(趋势分析)
-            ZbmxZbjczDTO qsfx = zbmxJcpgyjMapper.SeletQSFX(page.getXzqdm(), page.getZbbh(), page.getYear());
+            List<ZbmxZbjczDTO> qsfx = zbmxJcpgyjMapper.SeletQSFX(page.getXzqdm(), page.getZbbh(), page.getYear());
             //监测值(环比分析)
             Calendar calendar = Calendar.getInstance();
             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
             String jcsj = dateFormat.format(calendar.getTime());
-            ZbmxZbjczDTO hbfx = zbmxJcpgyjMapper.SelectHBFX(page.getXzqdm(), page.getZbbh(), page.getYear());
+            List<ZbmxZbjczDTO> hbfx = zbmxJcpgyjMapper.SelectHBFX(page.getXzqdm(), page.getZbbh(), page.getYear());
             //监测值(目标对比)
             String timejczmbdb = "";
             if (page.getYear() == null || Objects.equals(page.getYear(), "")) {
@@ -136,12 +136,14 @@ public class ZbmxJcpgyjServiceImpl implements IZbmxJcpgyjService {
             } else {
                 timejczmbdb = page.getYear();
             }
-            ZbmxZbjczDTO jczmbdb = zbmxJcpgyjMapper.SeletQSFX(page.getXzqdm(), page.getZbbh(), timejczmbdb);
+            List<ZbmxZbjczDTO> jczmbdb = zbmxJcpgyjMapper.SeletQSFX(page.getXzqdm(), page.getZbbh(), timejczmbdb);
 //            Calendar ca = Calendar.getInstance();
 //            ca.setTime(jczmbdb.getJcsj());
             List<KeyValuePair> mbdb = new ArrayList<>();
             if (jczmbdb != null) {
-                mbdb.add(new KeyValuePair().init(jczmbdb.getJcn(), jczmbdb.getJcz()));
+                for(ZbmxZbjczDTO cur : jczmbdb){
+                    mbdb.add(new KeyValuePair().init(cur.getJcn(), cur.getJcz()));
+                }
             }
             //规划目标值近期（目标对比）
             try {
@@ -159,11 +161,15 @@ public class ZbmxJcpgyjServiceImpl implements IZbmxJcpgyjService {
             }
             List<KeyValuePair> qsfxlist = new ArrayList<>();
             if (qsfx != null) {
-                qsfxlist.add(new KeyValuePair().init(qsfx.getJcn(), qsfx.getJcz()));
+                for(ZbmxZbjczDTO cur : qsfx){
+                    qsfxlist.add(new KeyValuePair().init(cur.getJcn(), cur.getJcz()));
+                }
             }
             List<KeyValuePair> hbfxlist = new ArrayList<>();
             if (hbfx != null) {
-                hbfxlist.add(new KeyValuePair().init(hbfx.getJcn(), hbfx.getJcz()));
+                for(ZbmxZbjczDTO cur : qsfx){
+                    hbfxlist.add(new KeyValuePair().init(cur.getJcn(), cur.getJcz()));
+                }
             }
             QueryWrapper<ZbmxZbxDTO> wrapper = new QueryWrapper<ZbmxZbxDTO>();
             wrapper.eq("zbbh", page.getZbbh());

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/yzt/XzqServiceImpl.java

@@ -10,20 +10,22 @@ import com.onemap.system.api.domain.SysDept;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 @Service
 public class XzqServiceImpl implements IXzqService {
 
     @Autowired
     private XzqMapper xzqMapper;
+    private Map<Boolean, Object> xzqMap = new HashMap<>();
 
     @Override
     public RequestResult GetXzq(Boolean city) {
-        try{
-            List<XzqSqlDTO> res = xzqMapper.GetXzq(city,"");
+        try {
+            if (xzqMap.get(city) != null) {
+                return RequestResult.success("成功", xzqMap.get(city));
+            }
+            List<XzqSqlDTO> res = xzqMapper.GetXzq(city, "");
             List<XzqDTO> XzqDtoArr = new ArrayList<XzqDTO>();
             if (res.size() > 0) {
                 for (XzqSqlDTO xzqSqlDTO : res) {
@@ -36,8 +38,9 @@ public class XzqServiceImpl implements IXzqService {
                 }
                 XzqDtoArr = buildDeptTree(XzqDtoArr);
             }
+            xzqMap.put(city, XzqDtoArr);
             return RequestResult.success("成功", XzqDtoArr);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return RequestResult.error("失败", null);
         }
@@ -45,7 +48,7 @@ public class XzqServiceImpl implements IXzqService {
 
     @Override
     public RequestResult GetXzqList(Boolean city) {
-        try{
+        try {
             List<XzqSqlDTO> res = xzqMapper.GetXzqList(city);
             List<XzqDTO> XzqDtoArr = new ArrayList<XzqDTO>();
             if (res.size() > 0) {
@@ -59,7 +62,7 @@ public class XzqServiceImpl implements IXzqService {
                 }
             }
             return RequestResult.success("成功", XzqDtoArr);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return RequestResult.error("失败", null);
         }

onemap-modules/onemap-apply/src/main/resources/mapper/oracle/ghss/ZbmxJcyjMapper.xml

@@ -124,9 +124,9 @@
             and t.zbbh = #{zbbh}
         </if>
         <if test="jcsj != null and jcsj != ''">
-            and (to_char(t.jcsj,'yyyy') = #{jcsj})
+            and jcn = #{jcsj}
         </if>
-        ) a where rowindex between 1 and 1
+        ) a
     </select>
 
     <select id="SelectHBFX" parameterType="java.lang.String"
@@ -159,6 +159,6 @@
         <if test="zbbh != null and zbbh != ''">
             and a.zbbh = #{zbbh}
         </if>
-        ) d where d.rowindex between 1 and 1
+        ) d
     </select>
 </mapper>

onemap-modules/onemap-apply/src/main/resources/mapper/oracle/yzt/ZymlMapper.xml

@@ -9,9 +9,9 @@
         select
         (select count(1) from t_yzt_zyml cou where cou.parent = 0
         <if test="resources != null and resources != ''">
-            and  cou.bsm in (
+            and cou.bsm in (
             with temp asGetMyCollect
-            (select #{resources} value from  dual t)
+            (select #{resources} value from dual t)
             select regexp_substr(replace(value, ' ,', ','), '[^,]+', 1, level)
             from temp
             connect by regexp_count(value, ',') + 1 >= level
@@ -22,17 +22,17 @@
         t.bsm as "bsm",
         t.name as "name",
         --case when t.sde is null then t.type else to_char(dblayer.servicetype) end as "type",
-        t.type  as "type",
+        t.type as "type",
         t.pbsm as "pbsm",
         t.icon as "icon",
         --case when t.sde is null then t.url else to_char(dblayer.address) end as "url",
-        t.url  as "url",
+        t.url as "url",
         t.lev as "lev",
         t.sort as "sort",
         t.state as "state",
         t.parent as "parent",
         --case when t.sde is null then t.server_type else 'Arcgis' end as "server_type",
-         t.server_type as "server_type",
+        t.server_type as "server_type",
         t.sflssj as "sflssj",
         t.sfdbfx as "sfdbfx",
         t.sfjl as "sfjl",
@@ -63,7 +63,7 @@
         <if test="resources != null and resources != ''">
             and (t.parent = 1 or t.bsm in (
             with temp as
-            (select #{resources} value from  dual t)
+            (select #{resources} value from dual t)
             select regexp_substr(replace(value, ' ,', ','), '[^,]+', 1, level)
             from temp
             connect by regexp_count(value, ',') + 1 >= level