一系列适配提交

onemap-modules/onemap-api/src/main/java/com/onemap/api/controller/ResultSearchController.java

@@ -6,6 +6,7 @@ import com.onemap.common.core.web.controller.BaseController;
 import com.onemap.common.core.web.domain.RequestResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -89,4 +90,18 @@ public class ResultSearchController extends BaseController {
         return resultSearchService.landGetRevisePage(ghlx, current, size, divisionCode, subject);
     }
 
+    /**
+     * 上传修编申请文件
+     *
+     * @param id
+     * @param instid
+     * @param file
+     * @param title
+     * @return
+     */
+    @PostMapping("/reuploadThirdpartyRevise")
+    public RequestResult reuploadThirdpartyRevise(String id ,String instid, MultipartFile file, String title) {
+        return resultSearchService.reuploadThirdpartyRevise(id, instid, file, title);
+    }
+
 }

onemap-modules/onemap-api/src/main/java/com/onemap/api/controller/SsoController.java

@@ -0,0 +1,57 @@
+package com.onemap.api.controller;
+
+
+import com.onemap.api.domain.AuthorizeDto;
+import com.onemap.api.domain.SsoParamDto;
+import com.onemap.api.service.SsoService;
+import com.onemap.api.service.ZhxzService;
+import com.onemap.common.core.web.controller.BaseController;
+import com.onemap.common.core.web.domain.RequestResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * 单点登录接口
+ *
+ * @author wanger
+ */
+@RequestMapping("/sso")
+@RestController
+public class SsoController extends BaseController {
+    @Autowired
+    private SsoService ssoService;
+
+    /**
+     * 获取Token对应登录用户信息
+     *
+     * @param allParams
+     * @return
+     */
+    @PostMapping("/checkToken")
+    public RequestResult checkToken(@RequestBody Map<String, String> allParams) {
+        return ssoService.checkToken(allParams);
+    }
+
+    /**
+     * 退出登录
+     *
+     * @return
+     */
+    @RequestMapping("/logout")
+    public RequestResult logout() {
+        return ssoService.logout();
+    }
+
+    /**
+     * 获取所属机构用户
+     *
+     * @return
+     */
+    @RequestMapping("/getUnitUsers")
+    public RequestResult getUnitUsers() {
+        return ssoService.getUnitUsers();
+    }
+}

onemap-modules/onemap-api/src/main/java/com/onemap/api/domain/SsoParamDto.java

@@ -0,0 +1,13 @@
+package com.onemap.api.domain;
+
+public class SsoParamDto {
+    private String Token;
+
+    public String getToken() {
+        return Token;
+    }
+
+    public void setToken(String token) {
+        Token = token;
+    }
+}

onemap-modules/onemap-api/src/main/java/com/onemap/api/domain/SsoUserDto.java

@@ -0,0 +1,49 @@
+package com.onemap.api.domain;
+
+public class SsoUserDto {
+    private String uid;
+    private String name;
+    private String img;
+    private String mobile;
+    private String email;
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getImg() {
+        return img;
+    }
+
+    public void setImg(String img) {
+        this.img = img;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+}

onemap-modules/onemap-api/src/main/java/com/onemap/api/domain/tCgglRevise.java

@@ -0,0 +1,123 @@
+package com.onemap.api.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@TableName("t_cggl_revise")
+public class tCgglRevise {
+    private String id;
+    private String name;
+    private String xzqdm;
+    private String xzqmc;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date uploadtime;
+    private String plantype;
+    private String path;
+    private String shyh;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date shsj;
+    private String shzt;
+    private String remark;
+    private String instid;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getXzqdm() {
+        return xzqdm;
+    }
+
+    public void setXzqdm(String xzqdm) {
+        this.xzqdm = xzqdm;
+    }
+
+    public String getXzqmc() {
+        return xzqmc;
+    }
+
+    public void setXzqmc(String xzqmc) {
+        this.xzqmc = xzqmc;
+    }
+
+    public Date getUploadtime() {
+        return uploadtime;
+    }
+
+    public void setUploadtime(Date uploadtime) {
+        this.uploadtime = uploadtime;
+    }
+
+    public String getPlantype() {
+        return plantype;
+    }
+
+    public void setPlantype(String plantype) {
+        this.plantype = plantype;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getShyh() {
+        return shyh;
+    }
+
+    public void setShyh(String shyh) {
+        this.shyh = shyh;
+    }
+
+    public Date getShsj() {
+        return shsj;
+    }
+
+    public void setShsj(Date shsj) {
+        this.shsj = shsj;
+    }
+
+    public String getShzt() {
+        return shzt;
+    }
+
+    public void setShzt(String shzt) {
+        this.shzt = shzt;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getInstid() {
+        return instid;
+    }
+
+    public void setInstid(String instid) {
+        this.instid = instid;
+    }
+}

onemap-modules/onemap-api/src/main/java/com/onemap/api/mapper/TCgglReviseMapper.java

@@ -0,0 +1,14 @@
+package com.onemap.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.api.domain.EscalationDTO;
+import com.onemap.api.domain.tCgglRevise;
+
+/**
+ * 数据层
+ *
+ * @author onemap
+ */
+public interface TCgglReviseMapper extends BaseMapper<tCgglRevise> {
+
+}

onemap-modules/onemap-api/src/main/java/com/onemap/api/service/ResultSearchService.java

@@ -1,6 +1,7 @@
 package com.onemap.api.service;
 
 import com.onemap.common.core.web.domain.RequestResult;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -16,4 +17,6 @@ public interface ResultSearchService {
     RequestResult downloadReoprt(String id, String solid, HttpServletResponse response);
 
     RequestResult landGetRevisePage(String ghlx, Integer current, Integer size, String divisionCode, String subject);
+
+    RequestResult reuploadThirdpartyRevise(String id, String instid, MultipartFile file, String title);
 }

onemap-modules/onemap-api/src/main/java/com/onemap/api/service/SsoService.java

@@ -0,0 +1,16 @@
+package com.onemap.api.service;
+
+import com.onemap.api.domain.SsoParamDto;
+import com.onemap.common.core.web.domain.RequestResult;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+public interface SsoService {
+
+    RequestResult checkToken(Map<String, String> allParams);
+
+    RequestResult logout();
+
+    RequestResult getUnitUsers();
+}

onemap-modules/onemap-api/src/main/java/com/onemap/api/service/impl/ResultSearchServiceImpl.java

@@ -2,18 +2,30 @@ package com.onemap.api.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.onemap.api.domain.TSysOpenUser;
+import com.onemap.api.domain.tCgglRevise;
+import com.onemap.api.mapper.TCgglReviseMapper;
+import com.onemap.api.mapper.TSysOpenUserMapper;
 import com.onemap.api.service.ResultSearchService;
 import com.onemap.api.util.Md5Utils;
 import com.onemap.api.util.RInterfaceUtil;
 import com.onemap.common.core.utils.StringUtils;
 import com.onemap.common.core.web.domain.RequestResult;
+import com.onemap.common.security.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Paths;
 import java.util.*;
 
 import static com.onemap.api.util.utils.getPlanType;
+import static com.onemap.api.util.utils.makedir;
 
 
 @Service
@@ -37,6 +49,12 @@ public class ResultSearchServiceImpl implements ResultSearchService {
     private String landGetRevisePageURI;
     @Value("${Cggl.reuploadThirdpartyRevise}")
     private String reuploadThirdpartyReviseURI;
+    @Value("${Cggl.temp}")
+    private String tempfolder;
+    @Autowired
+    private TSysOpenUserMapper tSysOpenUserMapper;
+    @Autowired
+    private TCgglReviseMapper tCgglReviseMapper;
 
     @Override
     public RequestResult getyb(String ghlx, Integer current, Integer size, String divisionCode, String subject) {
@@ -61,6 +79,8 @@ public class ResultSearchServiceImpl implements ResultSearchService {
         }
         if (StringUtils.isNotEmpty(divisionCode)) {
             jsonObject.put("divisionCode", divisionCode);
+        } else {
+            jsonObject.put("divisionCode", getOpenUserXzqdm());
         }
         JSONObject res = getRequestData(landMyAttendsDataURI, jsonObject);
         return changeResultObject(res, ghlx, null, null);
@@ -89,6 +109,8 @@ public class ResultSearchServiceImpl implements ResultSearchService {
         }
         if (StringUtils.isNotEmpty(divisionCode)) {
             jsonObject.put("divisionCode", divisionCode);
+        } else {
+            jsonObject.put("divisionCode", getOpenUserXzqdm());
         }
         JSONObject res = getRequestData(landGetAllTasksURI, jsonObject);
         return changeResultObject(res, ghlx, null, null);
@@ -113,11 +135,62 @@ public class ResultSearchServiceImpl implements ResultSearchService {
         }
         if (StringUtils.isNotEmpty(divisionCode)) {
             jsonObject.put("divisionCode", divisionCode);
+        } else {
+            jsonObject.put("divisionCode", getOpenUserXzqdm());
         }
         JSONObject res = getRequestData(landGetRevisePageURI, jsonObject);
         return changeResultObject(res, "村庄规划", null, null);
     }
 
+    @Override
+    public RequestResult reuploadThirdpartyRevise(String id, String instid, MultipartFile file, String title) {
+        //TODO wanger 存储修编申请  旗县上报到市级  市级负责将修编申请上报到自治区
+        if (StringUtils.isEmpty(id)) {
+            return RequestResult.error("id参数不允许为空！");
+        } else if (StringUtils.isEmpty(instid)) {
+            return RequestResult.error("instid参数不允许为空！");
+        } else if (StringUtils.isEmpty(title)) {
+            return RequestResult.error("title参数不允许为空！");
+        }
+        TSysOpenUser user = getOpenUser();
+        if (user == null) {
+            return RequestResult.error("用户信息获取失败！");
+        }
+        QueryWrapper<tCgglRevise> wrapper = new QueryWrapper();
+        wrapper.eq("instid", instid);
+        wrapper.eq("shzt", "0");
+        List<tCgglRevise> tCgglReviseList = tCgglReviseMapper.selectList(wrapper);
+        if (tCgglReviseList.size() > 0) {
+            return RequestResult.error("该流程主键已存在修编申请，请勿重复提交！");
+        }
+        String filepath = "";
+        if (file != null) {
+            String folder = String.format("%s旗县修编申请\\%s\\%s\\", tempfolder, user.getXzqmc(), title);
+            makedir(folder);
+            filepath = folder + "" + file.getOriginalFilename();
+            try {
+                file.transferTo(Paths.get(filepath));
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        tCgglRevise dto = new tCgglRevise();
+        dto.setId(id);
+        dto.setInstid(instid);
+        dto.setName(title);
+        dto.setPath(filepath);
+        dto.setUploadtime(new Date());
+        dto.setXzqdm(user.getXzqdm());
+        dto.setXzqmc(user.getXzqmc());
+        dto.setShzt("0");
+//        dto.setShyh("");
+//        dto.setShsj(new Date());
+//        dto.setPlantype("村庄规划");
+//        dto.setRemark("");
+        tCgglReviseMapper.insert(dto);
+        return RequestResult.success("操作成功！");
+    }
+
     @Override
     public RequestResult getybspjl(String id, String instid) {
         if (StringUtils.isEmpty(id) || StringUtils.isEmpty(instid)) {
@@ -274,4 +347,28 @@ public class ResultSearchServiceImpl implements ResultSearchService {
         }
         return token;
     }
+
+    /**
+     * 通过当前登录用户token获取openuser表信息
+     *
+     * @return
+     */
+    public TSysOpenUser getOpenUser() {
+        String username = SecurityUtils.getUsername();
+        QueryWrapper<TSysOpenUser> openUserWrapper = new QueryWrapper<>();
+        openUserWrapper.eq("name", username);
+        openUserWrapper.last(" and rownum = 1");
+        TSysOpenUser user = tSysOpenUserMapper.selectOne(openUserWrapper);
+        return user;
+    }
+
+    /**
+     * 通过当前登录用户token获取openuser的行政区代码
+     *
+     * @return
+     */
+    public String getOpenUserXzqdm() {
+        TSysOpenUser user = getOpenUser();
+        return user.getXzqdm();
+    }
 }

onemap-modules/onemap-api/src/main/java/com/onemap/api/service/impl/SsoServiceImpl.java

@@ -0,0 +1,64 @@
+package com.onemap.api.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.onemap.api.domain.AuthorizeDto;
+import com.onemap.api.domain.SsoParamDto;
+import com.onemap.api.domain.SsoUserDto;
+import com.onemap.api.domain.TSysOpenUser;
+import com.onemap.api.mapper.TSysOpenUserMapper;
+import com.onemap.api.service.SsoService;
+import com.onemap.common.core.constant.SecurityConstants;
+import com.onemap.common.core.domain.R;
+import com.onemap.common.core.utils.StringUtils;
+import com.onemap.common.core.web.domain.RequestResult;
+import com.onemap.common.security.service.TokenService;
+import com.onemap.system.api.RemoteUserService;
+import com.onemap.system.api.domain.SysUser;
+import com.onemap.system.api.model.LoginUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+
+@Service
+public class SsoServiceImpl implements SsoService {
+
+    @Autowired
+    private TSysOpenUserMapper tSysOpenUserMapper;
+    @Autowired
+    private RemoteUserService remoteUserService;
+    @Autowired
+    private TokenService tokenService;
+
+    @Override
+    public RequestResult checkToken(Map<String, String> allParams) {
+        String token = allParams.get("Token");
+        if (StringUtils.isEmpty(token)) {
+            return RequestResult.error("用户信息丢失！");
+        }
+        LoginUser user = tokenService.getLoginUser(token);
+        if (user == null) {
+            return RequestResult.error("用户信息获取失败！");
+        }
+        SysUser u = user.getSysUser();
+        SsoUserDto ssouser = new SsoUserDto();
+        ssouser.setUid(u.getUserName());
+        ssouser.setName(u.getNickName());
+        ssouser.setEmail(u.getEmail());
+        ssouser.setImg(u.getAvatar());
+        ssouser.setMobile(u.getPhonenumber());
+        return RequestResult.success("操作成功！", ssouser);
+    }
+
+    @Override
+    public RequestResult logout() {
+        return RequestResult.success("操作成功！");
+    }
+
+    @Override
+    public RequestResult getUnitUsers() {
+        return RequestResult.success("操作成功！");
+    }
+}

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

@@ -1,10 +1,7 @@
 package com.onemap.apply.controller.cggl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.onemap.apply.domain.cggl.CgscDto;
-import com.onemap.apply.domain.cggl.EscalationDTO;
-import com.onemap.apply.domain.cggl.EscalationInfoDTO;
-import com.onemap.apply.domain.cggl.ScmxDTO;
+import com.onemap.apply.domain.cggl.*;
 import com.onemap.apply.service.cggl.CgglService;
 import com.onemap.apply.service.fzss.IFzxzService;
 import com.onemap.apply.utils.Md5Utils;
@@ -433,4 +430,32 @@ public class CgglController extends BaseController {
         RequestResult res = cgglService.viewscjl(cgid);
         return res;
     }
+
+    /**
+     * 查询旗县修编列表
+     *
+     * @param limit
+     * @param page
+     * @param subject
+     * @param divisionCode
+     * @return
+     */
+    @GetMapping("/xblist")
+    public RecordTableDataInfo xblist(Integer limit, Integer page, String subject, String divisionCode) {
+        startRecordPage();
+        List<TCgglRevise> list = cgglService.xblist(subject, divisionCode);
+        return getRecordDataTable(list);
+    }
+
+    /**
+     * 下载修编文件
+     *
+     * @param
+     * @return
+     */
+    @GetMapping("/xbfiledownload")
+    public RequestResult xbfiledownload(String id, HttpServletResponse response) {
+        RequestResult res = cgglService.xbfiledownload(id, response);
+        return res;
+    }
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/sbjk/SbSearchController.java

@@ -33,18 +33,20 @@ public class SbSearchController extends BaseController {
 
     /**
      * 上传修编成果文件
-     * @param file 修编文件
+     *
+     * @param file   修编文件
      * @param instid 流程主键
      * @return
      */
     @PostMapping("/reuploadThirdpartyReviseData")
-    public JSONObject reuploadThirdpartyReviseData(MultipartFile file, String instid) {
-        return sbSearchService.reuploadThirdpartyReviseData(file, instid);
+    public JSONObject reuploadThirdpartyReviseData(String id, MultipartFile file, String instid) {
+        return sbSearchService.reuploadThirdpartyReviseData(id, file, instid);
     }
 
     /**
      * 接收修编成果文件上传的接口测试
-     * @param file 修编文件
+     *
+     * @param file   修编文件
      * @param instId 流程主键
      * @return
      */
@@ -64,7 +66,7 @@ public class SbSearchController extends BaseController {
      */
     @GetMapping("/getLandGetRevisePageData")
     public JSONObject getLandGetRevisePageData(Integer planType, Integer current, Integer size, String divisionCode, String subject) {
-        return sbSearchService.getLandGetRevisePageData(planType, current, size , divisionCode, subject);
+        return sbSearchService.getLandGetRevisePageData(planType, current, size, divisionCode, subject);
     }
 
     /**
@@ -78,7 +80,7 @@ public class SbSearchController extends BaseController {
      */
     @GetMapping("/getLandMyAttendsData")
     public JSONObject getLandMyAttendsData(Integer planType, Integer current, Integer size, String divisionCode, String subject) {
-        return sbSearchService.getLandMyAttendsData(planType, current, size , divisionCode, subject);
+        return sbSearchService.getLandMyAttendsData(planType, current, size, divisionCode, subject);
     }
 
     /**
@@ -89,7 +91,7 @@ public class SbSearchController extends BaseController {
      */
     @GetMapping("/getLandGetAllTasks")
     public JSONObject getLandGetAllTasks(Integer planType, Integer current, Integer size, String divisionCode, String subject) {
-        return sbSearchService.getLandGetAllTasks(planType, current, size , divisionCode, subject);
+        return sbSearchService.getLandGetAllTasks(planType, current, size, divisionCode, subject);
     }
 
     /**
@@ -124,7 +126,7 @@ public class SbSearchController extends BaseController {
      */
     @PostMapping("/landMyAttendsData")
     public WebResult landMyAttendsData(Integer planType, Integer current, Integer size, String divisionCode) {
-        return sbSearchService.landMyAttendsData(planType, current, size , divisionCode);
+        return sbSearchService.landMyAttendsData(planType, current, size, divisionCode);
     }
 
     /**
@@ -135,7 +137,7 @@ public class SbSearchController extends BaseController {
      */
     @PostMapping("/landGetRevisePage")
     public WebResult landGetRevisePage(Integer planType, Integer current, Integer size, String divisionCode) {
-        return sbSearchService.landGetRevisePage(planType, current, size , divisionCode);
+        return sbSearchService.landGetRevisePage(planType, current, size, divisionCode);
     }
 
     /**
@@ -146,7 +148,7 @@ public class SbSearchController extends BaseController {
      */
     @PostMapping("/landGetAllTasks")
     public WebResult landGetAllTasks(Integer planType, Integer current, Integer size, String divisionCode) {
-        return sbSearchService.landGetAllTasks(planType, current, size , divisionCode);
+        return sbSearchService.landGetAllTasks(planType, current, size, divisionCode);
     }
 
     /**

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/cggl/TCgglRevise.java

@@ -0,0 +1,123 @@
+package com.onemap.apply.domain.cggl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@TableName("t_cggl_revise")
+public class TCgglRevise {
+    private String id;
+    private String name;
+    private String xzqdm;
+    private String xzqmc;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date uploadtime;
+    private String plantype;
+    private String path;
+    private String shyh;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date shsj;
+    private String shzt;
+    private String remark;
+    private String instid;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getXzqdm() {
+        return xzqdm;
+    }
+
+    public void setXzqdm(String xzqdm) {
+        this.xzqdm = xzqdm;
+    }
+
+    public String getXzqmc() {
+        return xzqmc;
+    }
+
+    public void setXzqmc(String xzqmc) {
+        this.xzqmc = xzqmc;
+    }
+
+    public Date getUploadtime() {
+        return uploadtime;
+    }
+
+    public void setUploadtime(Date uploadtime) {
+        this.uploadtime = uploadtime;
+    }
+
+    public String getPlantype() {
+        return plantype;
+    }
+
+    public void setPlantype(String plantype) {
+        this.plantype = plantype;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getShyh() {
+        return shyh;
+    }
+
+    public void setShyh(String shyh) {
+        this.shyh = shyh;
+    }
+
+    public Date getShsj() {
+        return shsj;
+    }
+
+    public void setShsj(Date shsj) {
+        this.shsj = shsj;
+    }
+
+    public String getShzt() {
+        return shzt;
+    }
+
+    public void setShzt(String shzt) {
+        this.shzt = shzt;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getInstid() {
+        return instid;
+    }
+
+    public void setInstid(String instid) {
+        this.instid = instid;
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/cggl/TCgglReviseMapper.java

@@ -0,0 +1,13 @@
+package com.onemap.apply.mapper.cggl;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.apply.domain.cggl.TCgglRevise;
+
+/**
+ * 数据层
+ *
+ * @author onemap
+ */
+public interface TCgglReviseMapper extends BaseMapper<TCgglRevise> {
+
+}

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

@@ -3,6 +3,7 @@ package com.onemap.apply.service.cggl;
 import com.onemap.apply.domain.cggl.EscalationDTO;
 import com.onemap.apply.domain.cggl.EscalationInfoDTO;
 import com.onemap.apply.domain.cggl.ScmxDTO;
+import com.onemap.apply.domain.cggl.TCgglRevise;
 import com.onemap.common.core.web.domain.RequestResult;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -51,4 +52,8 @@ public interface CgglService {
     RequestResult startcgsc(String scmodel, String jqscmodel, String cgid);
 
     RequestResult viewscjl(String cgid);
+
+    List<TCgglRevise> xblist(String subject, String divisionCode);
+
+    RequestResult xbfiledownload(String id, HttpServletResponse response);
 }

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

@@ -62,6 +62,8 @@ public class CgglServiceImpl implements CgglService {
     private ScmxRecordMapper scmxRecordMapper;
     @Autowired
     private XzczghcgsbMapper xzczghcgsbMapper;
+    @Autowired
+    private TCgglReviseMapper tCgglReviseMapper;
 
     @Value("${Cggl.temp}")
     private String temp;
@@ -812,6 +814,40 @@ public class CgglServiceImpl implements CgglService {
         return RequestResult.success("查询成功！", res);
     }
 
+    @Override
+    public List<TCgglRevise> xblist(String subject, String divisionCode) {
+        QueryWrapper<TCgglRevise> wrapper = new QueryWrapper();
+        if (StringUtils.isNotEmpty(subject)) {
+            wrapper.eq("name", subject);
+        }
+        if (StringUtils.isNotEmpty(divisionCode)) {
+            wrapper.eq("xzqdm", divisionCode);
+        }
+        List<TCgglRevise> res = tCgglReviseMapper.selectList(wrapper);
+        return res;
+    }
+
+    @Override
+    public RequestResult xbfiledownload(String id, HttpServletResponse response) {
+        if (StringUtils.isEmpty(id)) {
+            return RequestResult.error("id参数不允许为空！");
+        }
+        QueryWrapper<TCgglRevise> wrapper = new QueryWrapper();
+        wrapper.eq("id", id);
+        TCgglRevise tCgglRevise = tCgglReviseMapper.selectOne(wrapper);
+        if (tCgglRevise == null) {
+            return RequestResult.error("id参数有问题！");
+        }
+        //文件流输出
+        try {
+            ZipDownload.downloadFile(response, tCgglRevise.getPath());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+//        ZipDownload.download(response, tCgglRevise.getPath(), tCgglRevise.getName());
+        return RequestResult.success("下载成功！");
+    }
+
     /**
      * 创建成果管理更新日志
      *

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/sbjk/SbSearchServiceImpl.java

@@ -3,7 +3,9 @@ package com.onemap.apply.service.impl.sbjk;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.onemap.apply.domain.cggl.TCgglRevise;
 import com.onemap.apply.domain.sbjk.XzczghcgsbDTO;
+import com.onemap.apply.mapper.cggl.TCgglReviseMapper;
 import com.onemap.apply.mapper.sbjk.XzczghcgsbMapper;
 import com.onemap.apply.service.sbjk.SbSearchService;
 import com.onemap.apply.service.sbjk.XzczghcgsbService;
@@ -14,6 +16,7 @@ import com.onemap.common.core.utils.uuid.IdUtils;
 import com.onemap.common.core.web.domain.AjaxResult;
 import com.onemap.common.core.web.domain.WebResult;
 import org.apache.commons.io.FileUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -51,22 +54,39 @@ public class SbSearchServiceImpl implements SbSearchService {
     private String landGetRevisePageURI;
     @Value("${cgbcxjk.reuploadThirdpartyRevise}")
     private String reuploadThirdpartyReviseURI;
+    @Autowired
+    private TCgglReviseMapper tCgglReviseMapper;
 
     @Override
-    public JSONObject reuploadThirdpartyReviseData(MultipartFile file, String instid) {
+    public JSONObject reuploadThirdpartyReviseData(String id, MultipartFile file, String instid) {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("instId", instid);
-        jsonObject.put("file", file);
+        if (StringUtils.isNotEmpty(id)) {
+            QueryWrapper<TCgglRevise> wrapper = new QueryWrapper();
+            wrapper.eq("id", id);
+            TCgglRevise tCgglRevise = tCgglReviseMapper.selectOne(wrapper);
+            if (tCgglRevise == null || StringUtils.isEmpty(tCgglRevise.getPath())) {
+                jsonObject.put("file", null);
+            } else {
+                String path = tCgglRevise.getPath();
+                File cur = new File(path);
+                jsonObject.put("file", cur);
+            }
+            tCgglRevise.setShzt("1");
+            tCgglReviseMapper.update(tCgglRevise, wrapper);
+        } else {
+            jsonObject.put("file", file);
+        }
         return getRequestFileData(reuploadThirdpartyReviseURI, jsonObject);
     }
 
     @Override
     public WebResult reuploadThirdpartyRevise(MultipartFile file, String instId) {
         WebResult res = new WebResult();
-        res.put("code" , 200);
-        res.put("data" , "");
-        res.put("msg" , "正常");
-        res.put("success" , true);
+        res.put("code", 200);
+        res.put("data", "");
+        res.put("msg", "正常");
+        res.put("success", true);
         return res;
     }
 

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/sbjk/SbSearchService.java

@@ -31,7 +31,7 @@ public interface SbSearchService {
 
     WebResult landGetRevisePage(Integer planType, Integer current, Integer size, String divisionCode);
 
-    JSONObject reuploadThirdpartyReviseData(MultipartFile file, String instid);
+    JSONObject reuploadThirdpartyReviseData(String id, MultipartFile file, String instid);
 
     WebResult reuploadThirdpartyRevise(MultipartFile file, String instId);
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/utils/ZipDownload.java

@@ -3,6 +3,7 @@ package com.onemap.apply.utils;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -45,6 +46,26 @@ public class ZipDownload {
         }
     }
 
+    public static void downloadFile(HttpServletResponse response, String filepath) throws IOException {
+        // 设置响应头信息，例如文件名称和内容类型
+        File file = new File(filepath);
+        response.setContentType("application/octet-stream"); // 适用于任何二进制流内容类型，根据文件类型更改MIME类型
+        response.setHeader("Content-Disposition", "attachment; filename=\"" + file.getName() + "\"");
+        try (OutputStream out = response.getOutputStream();
+             FileInputStream in = new FileInputStream(Paths.get(filepath).toFile())) {
+            byte[] buffer = new byte[4096]; // 缓冲区大小可以根据需要调整
+            int bytesRead;
+            // 读取文件并写入响应输出流中
+            while ((bytesRead = in.read(buffer)) != -1) {
+                out.write(buffer, 0, bytesRead);
+            }
+            out.flush(); // 刷新输出流，确保所有数据都已写入响应中
+        } catch (IOException e) {
+            // 处理异常，例如记录日志或向前端发送错误信息等。
+            throw e; // 或者根据需要处理异常，例如抛出自定义异常等。
+        }
+    }
+
     /**
      * 递归压缩方法
      *

onemap-modules/onemap-system/src/main/java/com/onemap/system/controller/TCghjDdxtController.java

@@ -0,0 +1,98 @@
+package com.onemap.system.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.onemap.common.log.annotation.Log;
+import com.onemap.common.log.enums.BusinessType;
+import com.onemap.common.security.annotation.RequiresPermissions;
+import com.onemap.system.domain.TCghjDdxt;
+import com.onemap.system.service.ITCghjDdxtService;
+import com.onemap.common.core.web.controller.BaseController;
+import com.onemap.common.core.web.domain.AjaxResult;
+import com.onemap.common.core.utils.poi.ExcelUtil;
+import com.onemap.common.core.web.page.TableDataInfo;
+
+/**
+ * 成果汇交-单点登录系统Controller
+ *
+ * @author siwei
+ * @date 2025-02-20
+ */
+@RestController
+@RequestMapping("/ddxt")
+public class TCghjDdxtController extends BaseController {
+    @Autowired
+    private ITCghjDdxtService tCghjDdxtService;
+
+    /**
+     * 查询成果汇交-单点登录系统列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(TCghjDdxt tCghjDdxt) {
+        startPage();
+        List<TCghjDdxt> list = tCghjDdxtService.selectTCghjDdxtList(tCghjDdxt);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出成果汇交-单点登录系统列表
+     */
+    @RequiresPermissions("system:ddxt:export")
+    @Log(title = "成果汇交-单点登录系统", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TCghjDdxt tCghjDdxt) {
+        List<TCghjDdxt> list = tCghjDdxtService.selectTCghjDdxtList(tCghjDdxt);
+        ExcelUtil<TCghjDdxt> util = new ExcelUtil<TCghjDdxt>(TCghjDdxt.class);
+        util.exportExcel(response, list, "成果汇交-单点登录系统数据");
+    }
+
+    /**
+     * 获取成果汇交-单点登录系统详细信息
+     */
+    @RequiresPermissions("system:ddxt:query")
+    @GetMapping(value = "/{bsm}")
+    public AjaxResult getInfo(@PathVariable("bsm") String bsm) {
+        return success(tCghjDdxtService.selectTCghjDdxtByBsm(bsm));
+    }
+
+    /**
+     * 新增成果汇交-单点登录系统
+     */
+    @RequiresPermissions("system:ddxt:add")
+    @Log(title = "成果汇交-单点登录系统", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TCghjDdxt tCghjDdxt) {
+        return toAjax(tCghjDdxtService.insertTCghjDdxt(tCghjDdxt));
+    }
+
+    /**
+     * 修改成果汇交-单点登录系统
+     */
+    @RequiresPermissions("system:ddxt:edit")
+    @Log(title = "成果汇交-单点登录系统", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TCghjDdxt tCghjDdxt) {
+        return toAjax(tCghjDdxtService.updateTCghjDdxt(tCghjDdxt));
+    }
+
+    /**
+     * 删除成果汇交-单点登录系统
+     */
+    @RequiresPermissions("system:ddxt:remove")
+    @Log(title = "成果汇交-单点登录系统", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{bsms}")
+    public AjaxResult remove(@PathVariable String[] bsms) {
+        return toAjax(tCghjDdxtService.deleteTCghjDdxtByBsms(bsms));
+    }
+}

onemap-modules/onemap-system/src/main/java/com/onemap/system/domain/TCghjDdxt.java

@@ -0,0 +1,125 @@
+package com.onemap.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.onemap.common.core.annotation.Excel;
+import com.onemap.common.core.web.domain.BaseEntity;
+
+/**
+ * 成果汇交-单点登录系统对象 t_cghj_ddxt
+ * 
+ * @author siwei
+ * @date 2025-02-20
+ */
+public class TCghjDdxt
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 标识码 */
+    private String bsm;
+
+    /** 行政区代码 */
+    @Excel(name = "行政区代码")
+    private String xzqdm;
+
+    /** 行政区名称 */
+    @Excel(name = "行政区名称")
+    private String xzqmc;
+
+    /** 系统名称 */
+    @Excel(name = "系统名称")
+    private String xtmc;
+
+    /** 系统地址 */
+    @Excel(name = "系统地址")
+    private String url;
+
+    /** 系统描述 */
+    private String xtms;
+
+    /** 状态（0异常 1正常） */
+    @Excel(name = "状态", readConverterExp = "0=异常,1=正常")
+    private Integer start;
+
+    /** 备注 */
+    private String note;
+
+    /** 图片 */
+    private String img;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getBsm() {
+        return bsm;
+    }
+
+    public void setBsm(String bsm) {
+        this.bsm = bsm;
+    }
+
+    public String getXzqdm() {
+        return xzqdm;
+    }
+
+    public void setXzqdm(String xzqdm) {
+        this.xzqdm = xzqdm;
+    }
+
+    public String getXzqmc() {
+        return xzqmc;
+    }
+
+    public void setXzqmc(String xzqmc) {
+        this.xzqmc = xzqmc;
+    }
+
+    public String getXtmc() {
+        return xtmc;
+    }
+
+    public void setXtmc(String xtmc) {
+        this.xtmc = xtmc;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getXtms() {
+        return xtms;
+    }
+
+    public void setXtms(String xtms) {
+        this.xtms = xtms;
+    }
+
+    public Integer getStart() {
+        return start;
+    }
+
+    public void setStart(Integer start) {
+        this.start = start;
+    }
+
+    public String getNote() {
+        return note;
+    }
+
+    public void setNote(String note) {
+        this.note = note;
+    }
+
+    public String getImg() {
+        return img;
+    }
+
+    public void setImg(String img) {
+        this.img = img;
+    }
+}

onemap-modules/onemap-system/src/main/java/com/onemap/system/mapper/TCghjDdxtMapper.java

@@ -0,0 +1,61 @@
+package com.onemap.system.mapper;
+
+import java.util.List;
+import com.onemap.system.domain.TCghjDdxt;
+
+/**
+ * 成果汇交-单点登录系统Mapper接口
+ * 
+ * @author siwei
+ * @date 2025-02-20
+ */
+public interface TCghjDdxtMapper 
+{
+    /**
+     * 查询成果汇交-单点登录系统
+     * 
+     * @param bsm 成果汇交-单点登录系统主键
+     * @return 成果汇交-单点登录系统
+     */
+    public TCghjDdxt selectTCghjDdxtByBsm(String bsm);
+
+    /**
+     * 查询成果汇交-单点登录系统列表
+     * 
+     * @param tCghjDdxt 成果汇交-单点登录系统
+     * @return 成果汇交-单点登录系统集合
+     */
+    public List<TCghjDdxt> selectTCghjDdxtList(TCghjDdxt tCghjDdxt);
+
+    /**
+     * 新增成果汇交-单点登录系统
+     * 
+     * @param tCghjDdxt 成果汇交-单点登录系统
+     * @return 结果
+     */
+    public int insertTCghjDdxt(TCghjDdxt tCghjDdxt);
+
+    /**
+     * 修改成果汇交-单点登录系统
+     * 
+     * @param tCghjDdxt 成果汇交-单点登录系统
+     * @return 结果
+     */
+    public int updateTCghjDdxt(TCghjDdxt tCghjDdxt);
+
+    /**
+     * 删除成果汇交-单点登录系统
+     * 
+     * @param bsm 成果汇交-单点登录系统主键
+     * @return 结果
+     */
+    public int deleteTCghjDdxtByBsm(String bsm);
+
+    /**
+     * 批量删除成果汇交-单点登录系统
+     * 
+     * @param bsms 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTCghjDdxtByBsms(String[] bsms);
+}

onemap-modules/onemap-system/src/main/java/com/onemap/system/service/ITCghjDdxtService.java

@@ -0,0 +1,61 @@
+package com.onemap.system.service;
+
+import java.util.List;
+import com.onemap.system.domain.TCghjDdxt;
+
+/**
+ * 成果汇交-单点登录系统Service接口
+ * 
+ * @author siwei
+ * @date 2025-02-20
+ */
+public interface ITCghjDdxtService 
+{
+    /**
+     * 查询成果汇交-单点登录系统
+     * 
+     * @param bsm 成果汇交-单点登录系统主键
+     * @return 成果汇交-单点登录系统
+     */
+    public TCghjDdxt selectTCghjDdxtByBsm(String bsm);
+
+    /**
+     * 查询成果汇交-单点登录系统列表
+     * 
+     * @param tCghjDdxt 成果汇交-单点登录系统
+     * @return 成果汇交-单点登录系统集合
+     */
+    public List<TCghjDdxt> selectTCghjDdxtList(TCghjDdxt tCghjDdxt);
+
+    /**
+     * 新增成果汇交-单点登录系统
+     * 
+     * @param tCghjDdxt 成果汇交-单点登录系统
+     * @return 结果
+     */
+    public int insertTCghjDdxt(TCghjDdxt tCghjDdxt);
+
+    /**
+     * 修改成果汇交-单点登录系统
+     * 
+     * @param tCghjDdxt 成果汇交-单点登录系统
+     * @return 结果
+     */
+    public int updateTCghjDdxt(TCghjDdxt tCghjDdxt);
+
+    /**
+     * 批量删除成果汇交-单点登录系统
+     * 
+     * @param bsms 需要删除的成果汇交-单点登录系统主键集合
+     * @return 结果
+     */
+    public int deleteTCghjDdxtByBsms(String[] bsms);
+
+    /**
+     * 删除成果汇交-单点登录系统信息
+     * 
+     * @param bsm 成果汇交-单点登录系统主键
+     * @return 结果
+     */
+    public int deleteTCghjDdxtByBsm(String bsm);
+}

onemap-modules/onemap-system/src/main/java/com/onemap/system/service/impl/TCghjDdxtServiceImpl.java

@@ -0,0 +1,93 @@
+package com.onemap.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.onemap.system.mapper.TCghjDdxtMapper;
+import com.onemap.system.domain.TCghjDdxt;
+import com.onemap.system.service.ITCghjDdxtService;
+
+/**
+ * 成果汇交-单点登录系统Service业务层处理
+ * 
+ * @author siwei
+ * @date 2025-02-20
+ */
+@Service
+public class TCghjDdxtServiceImpl implements ITCghjDdxtService 
+{
+    @Autowired
+    private TCghjDdxtMapper tCghjDdxtMapper;
+
+    /**
+     * 查询成果汇交-单点登录系统
+     * 
+     * @param bsm 成果汇交-单点登录系统主键
+     * @return 成果汇交-单点登录系统
+     */
+    @Override
+    public TCghjDdxt selectTCghjDdxtByBsm(String bsm)
+    {
+        return tCghjDdxtMapper.selectTCghjDdxtByBsm(bsm);
+    }
+
+    /**
+     * 查询成果汇交-单点登录系统列表
+     * 
+     * @param tCghjDdxt 成果汇交-单点登录系统
+     * @return 成果汇交-单点登录系统
+     */
+    @Override
+    public List<TCghjDdxt> selectTCghjDdxtList(TCghjDdxt tCghjDdxt)
+    {
+        return tCghjDdxtMapper.selectTCghjDdxtList(tCghjDdxt);
+    }
+
+    /**
+     * 新增成果汇交-单点登录系统
+     * 
+     * @param tCghjDdxt 成果汇交-单点登录系统
+     * @return 结果
+     */
+    @Override
+    public int insertTCghjDdxt(TCghjDdxt tCghjDdxt)
+    {
+        return tCghjDdxtMapper.insertTCghjDdxt(tCghjDdxt);
+    }
+
+    /**
+     * 修改成果汇交-单点登录系统
+     * 
+     * @param tCghjDdxt 成果汇交-单点登录系统
+     * @return 结果
+     */
+    @Override
+    public int updateTCghjDdxt(TCghjDdxt tCghjDdxt)
+    {
+        return tCghjDdxtMapper.updateTCghjDdxt(tCghjDdxt);
+    }
+
+    /**
+     * 批量删除成果汇交-单点登录系统
+     * 
+     * @param bsms 需要删除的成果汇交-单点登录系统主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTCghjDdxtByBsms(String[] bsms)
+    {
+        return tCghjDdxtMapper.deleteTCghjDdxtByBsms(bsms);
+    }
+
+    /**
+     * 删除成果汇交-单点登录系统信息
+     * 
+     * @param bsm 成果汇交-单点登录系统主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTCghjDdxtByBsm(String bsm)
+    {
+        return tCghjDdxtMapper.deleteTCghjDdxtByBsm(bsm);
+    }
+}

onemap-modules/onemap-system/src/main/resources/mapper/oracle/system/TCghjDdxtMapper.xml

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.onemap.system.mapper.TCghjDdxtMapper">
+
+    <resultMap type="TCghjDdxt" id="TCghjDdxtResult">
+        <result property="bsm" column="bsm"/>
+        <result property="xzqdm" column="xzqdm"/>
+        <result property="xzqmc" column="xzqmc"/>
+        <result property="xtmc" column="xtmc"/>
+        <result property="url" column="url"/>
+        <result property="xtms" column="xtms"/>
+        <result property="start" column="start"/>
+        <result property="note" column="note"/>
+        <result property="img" column="img"/>
+    </resultMap>
+
+    <sql id="selectTCghjDdxtVo">
+        select * from t_cghj_ddxt
+    </sql>
+
+    <select id="selectTCghjDdxtList" parameterType="TCghjDdxt" resultMap="TCghjDdxtResult">
+        <include refid="selectTCghjDdxtVo"/>
+        <where>
+            <if test="xzqdm != null  and xzqdm != ''">and xzqdm like '%'||#{xzqdm}||'%'</if>
+            <if test="xzqmc != null  and xzqmc != ''">and xzqmc like '%'||#{xzqmc}||'%'</if>
+            <if test="xtmc != null  and xtmc != ''">and xtmc like '%'||#{xtmc}||'%'</if>
+        </where>
+    </select>
+
+    <select id="selectTCghjDdxtByBsm" parameterType="String" resultMap="TCghjDdxtResult">
+        <include refid="selectTCghjDdxtVo"/>
+        where bsm = #{bsm}
+    </select>
+
+    <insert id="insertTCghjDdxt" parameterType="TCghjDdxt">
+        insert into t_cghj_ddxt
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            bsm,
+            <if test="xzqdm != null">xzqdm,</if>
+            <if test="xzqmc != null">xzqmc,</if>
+            <if test="xtmc != null">xtmc,</if>
+            <if test="url != null">url,</if>
+            <if test="xtms != null">xtms,</if>
+            <if test="note != null">note,</if>
+            <if test="img != null">img,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            sys_guid(),
+            <if test="xzqdm != null">#{xzqdm},</if>
+            <if test="xzqmc != null">#{xzqmc},</if>
+            <if test="xtmc != null">#{xtmc},</if>
+            <if test="url != null">#{url},</if>
+            <if test="xtms != null">#{xtms},</if>
+            <if test="note != null">#{note},</if>
+            <if test="img != null">#{img},</if>
+        </trim>
+    </insert>
+
+    <update id="updateTCghjDdxt" parameterType="TCghjDdxt">
+        update t_cghj_ddxt
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="xzqdm != null">xzqdm = #{xzqdm},</if>
+            <if test="xzqmc != null">xzqmc = #{xzqmc},</if>
+            <if test="xtmc != null">xtmc = #{xtmc},</if>
+            <if test="url != null">url = #{url},</if>
+            <if test="xtms != null">xtms = #{xtms},</if>
+            <if test="note != null">note = #{note},</if>
+            <if test="img != null">img = #{img},</if>
+        </trim>
+        where bsm = #{bsm}
+    </update>
+
+    <delete id="deleteTCghjDdxtByBsm" parameterType="String">
+        delete from t_cghj_ddxt where bsm = #{bsm}
+    </delete>
+
+    <delete id="deleteTCghjDdxtByBsms" parameterType="String">
+        delete from t_cghj_ddxt where bsm in
+        <foreach item="bsm" collection="array" open="(" separator="," close=")">
+            #{bsm}
+        </foreach>
+    </delete>
+</mapper>