fix 新增核酸检测列表页面

boman-web-core/src/main/java/com/boman/web/core/controller/AccountingDataController.java

@@ -0,0 +1,44 @@
+package com.boman.web.core.controller;
+/**
+ *
+ * @author tjf
+ * @Date: 2022/05/13/11:11
+ */
+
+import com.boman.common.core.web.controller.BaseController;
+import com.boman.domain.TableDataInfo;
+import com.boman.web.core.domain.AccountingData;
+import com.boman.web.core.domain.vo.AccountingDataVo;
+import com.boman.web.core.service.accounting.IAccountingDataService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 常住人口Controller
+ *
+ * @author ruoyi
+ * @date 2022-01-14
+ */
+@RestController
+@RequestMapping("/core/account")
+@Slf4j
+public class AccountingDataController extends BaseController {
+
+    @Resource
+    private IAccountingDataService accountingDataService;
+    /***
+     *  潜山核酸数据列表页(根据户籍地)
+     * @return
+     */
+    @GetMapping("/nucleicAcid/hj")
+    public TableDataInfo nucleicAcid(AccountingData accountingData) {
+        List<AccountingDataVo> list = accountingDataService.nucleicAcidHJList(accountingData);
+        return getDataTable(list);
+    }
+
+}

boman-web-core/src/main/java/com/boman/web/core/controller/CzrkController.java

@@ -11,6 +11,7 @@ import com.boman.common.log.enums.BusinessType;
 import com.boman.common.security.annotation.PreAuthorize;
 import com.boman.domain.*;
 import com.boman.domain.dto.AjaxResult;
+import com.boman.web.core.domain.AccountingData;
 import com.boman.web.core.domain.JsonRequest;
 import com.boman.web.core.service.czrk.ICzrkService;
 import com.boman.web.core.utils.AuthUtils;
@@ -298,33 +299,4 @@ public class CzrkController extends BaseController {
     public AjaxResult addBabyCzrk(@RequestBody Czrk czrk) {
         return czrkService.addBabyCzrk(czrk);
     }
-
-    /***
-     *  潜山核酸数据
-     * @param xzqh 区划
-     * @param djsjqs 开始时间
-     * @param djsjjs 结束时间
-     * @param name 姓名
-     * @param sfzhm 身份证号
-     * @return
-     */
-    @GetMapping("/nucleicAcid")
-    public AjaxResult nucleicAcid(String xzqh,String djsjqs, String djsjjs, String name, String sfzhm) {
-        return czrkService.nucleicAcid(xzqh,djsjqs,djsjjs,name,sfzhm);
-    }
-
-    /***
-     * 潜山来宜人员数据
-     * @param rc
-     * @param djsjqs
-     * @param djsjjs
-     * @param name
-     * @param sfzhm
-     * @return
-     */
-    @GetMapping("/toQianshan")
-    public AjaxResult toQianshan(String rc,String djsjqs, String djsjjs, String name, String sfzhm) {
-        return czrkService.toQianshan(rc,djsjqs,djsjjs,name,sfzhm);
-    }
-
 }

boman-web-core/src/main/java/com/boman/web/core/domain/AccountingData.java

@@ -0,0 +1,310 @@
+package com.boman.web.core.domain;
+/**
+ * @author tjf
+ * @Date: 2022/05/13/10:18
+ */
+
+import com.boman.domain.BaseEntity;
+
+/**
+ * @author tjf
+ * @Date: 2022/05/13/10:18
+ */
+public class AccountingData extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 检验结果出具时间（审核时间）
+     */
+    private String jcsj;
+    /**
+     * 联系电话
+     */
+    private String lxdh;
+    /**
+     *
+     */
+    private String address;
+    /**
+     * 批次号
+     */
+    private String batchNumber;
+    /**
+     * 样本重点人群oid
+     */
+    private String focusPerson;
+
+    /**
+     * 检测结果 0:阴性 1:阳性
+     */
+    private String jcjg;
+    /**
+     * 从哪儿来
+     */
+    private String fromCity;
+    /**
+     * 检测地点
+     */
+    private String jcdd;
+    /**
+     * 采集地点
+     */
+    private String cjdd;
+    /**
+     * 去哪儿
+     */
+    private String toCity;
+    /**
+     * 0=采样收集 1=历史结果导入
+     */
+    private String source;
+    /**
+     * 身份证
+     */
+    private String zjhm;
+    /**
+     * 采集时间
+     */
+    private String cjsj;
+    /**
+     * 证件类型
+     */
+    private String certificateNoType;
+    /**
+     * 姓名
+     */
+    private String xm;
+    /**
+     * 交通工具
+     */
+    private String transit;
+    /**
+     * 采集人名称
+     */
+    private String collectorName;
+    /**
+     * 采集县区
+     */
+    private String cjssxq;
+
+    /**
+     * 第三方主键
+     */
+    private String mainKey;
+    /**
+     * 第三方修改时间
+     */
+    private String modifyDate;
+
+
+    /**
+     * 是否删除
+     */
+    private String isDel;
+    /**
+     * 是否核酸
+     */
+    private String isNucleicAcid;
+    /**
+     * 时间段
+     */
+    private String timeSlot;
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getIsNucleicAcid() {
+        return isNucleicAcid;
+    }
+
+    public void setIsNucleicAcid(String isNucleicAcid) {
+        this.isNucleicAcid = isNucleicAcid;
+    }
+
+    public String getTimeSlot() {
+        return timeSlot;
+    }
+
+    public void setTimeSlot(String timeSlot) {
+        this.timeSlot = timeSlot;
+    }
+
+    public String getModifyDate() {
+        return modifyDate;
+    }
+
+    public void setModifyDate(String modifyDate) {
+        this.modifyDate = modifyDate;
+    }
+
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+
+    public String getJcsj() {
+        return jcsj;
+    }
+
+    public void setJcsj(String jcsj) {
+        this.jcsj = jcsj;
+    }
+
+    public String getLxdh() {
+        return lxdh;
+    }
+
+    public void setLxdh(String lxdh) {
+        this.lxdh = lxdh;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getBatchNumber() {
+        return batchNumber;
+    }
+
+    public void setBatchNumber(String batchNumber) {
+        this.batchNumber = batchNumber;
+    }
+
+    public String getFocusPerson() {
+        return focusPerson;
+    }
+
+    public void setFocusPerson(String focusPerson) {
+        this.focusPerson = focusPerson;
+    }
+
+    public String getJcjg() {
+        return jcjg;
+    }
+
+    public void setJcjg(String jcjg) {
+        this.jcjg = jcjg;
+    }
+
+    public String getFromCity() {
+        return fromCity;
+    }
+
+    public void setFromCity(String fromCity) {
+        this.fromCity = fromCity;
+    }
+
+    public String getJcdd() {
+        return jcdd;
+    }
+
+    public void setJcdd(String jcdd) {
+        this.jcdd = jcdd;
+    }
+
+    public String getCjdd() {
+        return cjdd;
+    }
+
+    public void setCjdd(String cjdd) {
+        this.cjdd = cjdd;
+    }
+
+    public String getToCity() {
+        return toCity;
+    }
+
+    public void setToCity(String toCity) {
+        this.toCity = toCity;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public String getZjhm() {
+        return zjhm;
+    }
+
+    public void setZjhm(String zjhm) {
+        this.zjhm = zjhm;
+    }
+
+    public String getCjsj() {
+        return cjsj;
+    }
+
+    public void setCjsj(String cjsj) {
+        this.cjsj = cjsj;
+    }
+
+    public String getCertificateNoType() {
+        return certificateNoType;
+    }
+
+    public void setCertificateNoType(String certificateNoType) {
+        this.certificateNoType = certificateNoType;
+    }
+
+    public String getXm() {
+        return xm;
+    }
+
+    public void setXm(String xm) {
+        this.xm = xm;
+    }
+
+    public String getTransit() {
+        return transit;
+    }
+
+    public void setTransit(String transit) {
+        this.transit = transit;
+    }
+
+    public String getCollectorName() {
+        return collectorName;
+    }
+
+    public void setCollectorName(String collectorName) {
+        this.collectorName = collectorName;
+    }
+
+    public String getCjssxq() {
+        return cjssxq;
+    }
+
+    public void setCjssxq(String cjssxq) {
+        this.cjssxq = cjssxq;
+    }
+
+    public String getMainKey() {
+        return mainKey;
+    }
+
+    public void setMainKey(String mainKey) {
+        this.mainKey = mainKey;
+    }
+
+    public String getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(String isDel) {
+        this.isDel = isDel;
+    }
+}

boman-web-core/src/main/java/com/boman/web/core/domain/vo/AccountingDataVo.java

@@ -0,0 +1,439 @@
+package com.boman.web.core.domain.vo;
+/**
+ * @author tjf
+ * @Date: 2022/05/13/10:18
+ */
+
+import com.boman.domain.BaseEntity;
+import com.boman.domain.annotation.Excel;
+
+/**核酸列表页返回
+ * @author tjf
+ * @Date: 2022/05/13/10:18
+ */
+public class AccountingDataVo extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 检验结果出具时间（审核时间）
+     */
+    private String jcsj;
+    /**
+     * 联系电话
+     */
+    private String lxdh;
+    /**
+     *
+     */
+    private String address;
+    /**
+     * 批次号
+     */
+    private String batchNumber;
+    /**
+     * 样本重点人群oid
+     */
+    private String focusPerson;
+
+    /**
+     * 检测结果 0:阴性 1:阳性
+     */
+    private String jcjg;
+    /**
+     * 从哪儿来
+     */
+    private String fromCity;
+    /**
+     * 检测地点
+     */
+    private String jcdd;
+    /**
+     * 采集地点
+     */
+    private String cjdd;
+    /**
+     * 去哪儿
+     */
+    private String toCity;
+    /**
+     * 0=采样收集 1=历史结果导入
+     */
+    private String source;
+    /**
+     * 身份证
+     */
+    private String zjhm;
+    /**
+     * 采集时间
+     */
+    private String cjsj;
+    /**
+     * 证件类型
+     */
+    private String certificateNoType;
+    /**
+     * 姓名
+     */
+    private String xm;
+    /**
+     * 交通工具
+     */
+    private String transit;
+    /**
+     * 采集人名称
+     */
+    private String collectorName;
+    /**
+     * 采集县区
+     */
+    private String cjssxq;
+
+    /**
+     * 第三方主键
+     */
+    private String mainKey;
+    /**
+     * 第三方修改时间
+     */
+    private String modifyDate;
+
+
+    /**
+     * 是否删除
+     */
+    private String isDel;
+    /**
+     * 是否核酸
+     */
+    private String isNucleicAcid;
+    /**
+     * 时间段
+     */
+    private String timeSlot;
+    /**
+     * 人口信息登记的联系电话
+     */
+    private String phoneNum;
+
+
+
+
+
+    /**
+     * 户籍地的省份
+     */
+    //@Excel(name = "户籍地的省份")
+    private String province;
+
+
+
+    /**
+     * 户籍地的城市
+     */
+    //@Excel(name = "户籍地的城市")
+    private String city;
+
+
+
+    /**
+     * 户籍地的区
+     */
+    //@Excel(name = "户籍地的区")
+    private String region;
+
+
+    /**
+     * 户籍地的镇
+     */
+    //@Excel(name = "户籍地的镇")
+    private String villageTowns;
+
+    /**
+     * 户籍地的村
+     */
+    //@Excel(name = "户籍地的村")
+    private String village;
+
+    /**
+     * 户籍地的详细地址
+     */
+    @Excel(name = "户籍详细地址")
+    private String nowIn;
+    /** 现居地列表展示 安徽省安庆市潜山市xx乡xx村xx组 */
+    @Excel(name = "居住地址")
+    private String nowInSelect;
+    /** 户籍地列表展示 安徽省安庆市潜山市xx乡xx村xx组 */
+    @Excel(name = "户籍地址")
+    private String domicileSelect;
+
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
+    public String getVillageTowns() {
+        return villageTowns;
+    }
+
+    public void setVillageTowns(String villageTowns) {
+        this.villageTowns = villageTowns;
+    }
+
+    public String getVillage() {
+        return village;
+    }
+
+    public void setVillage(String village) {
+        this.village = village;
+    }
+
+    public String getNowIn() {
+        return nowIn;
+    }
+
+    public void setNowIn(String nowIn) {
+        this.nowIn = nowIn;
+    }
+
+    public String getPhoneNum() {
+        return phoneNum;
+    }
+
+    public void setPhoneNum(String phoneNum) {
+        this.phoneNum = phoneNum;
+    }
+
+    public String getNowInSelect() {
+        return nowInSelect;
+    }
+
+    public void setNowInSelect(String nowInSelect) {
+        this.nowInSelect = nowInSelect;
+    }
+
+    public String getDomicileSelect() {
+        return domicileSelect;
+    }
+
+    public void setDomicileSelect(String domicileSelect) {
+        this.domicileSelect = domicileSelect;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getIsNucleicAcid() {
+        return isNucleicAcid;
+    }
+
+    public void setIsNucleicAcid(String isNucleicAcid) {
+        this.isNucleicAcid = isNucleicAcid;
+    }
+
+    public String getTimeSlot() {
+        return timeSlot;
+    }
+
+    public void setTimeSlot(String timeSlot) {
+        this.timeSlot = timeSlot;
+    }
+
+    public String getModifyDate() {
+        return modifyDate;
+    }
+
+    public void setModifyDate(String modifyDate) {
+        this.modifyDate = modifyDate;
+    }
+
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+
+    public String getJcsj() {
+        return jcsj;
+    }
+
+    public void setJcsj(String jcsj) {
+        this.jcsj = jcsj;
+    }
+
+    public String getLxdh() {
+        return lxdh;
+    }
+
+    public void setLxdh(String lxdh) {
+        this.lxdh = lxdh;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getBatchNumber() {
+        return batchNumber;
+    }
+
+    public void setBatchNumber(String batchNumber) {
+        this.batchNumber = batchNumber;
+    }
+
+    public String getFocusPerson() {
+        return focusPerson;
+    }
+
+    public void setFocusPerson(String focusPerson) {
+        this.focusPerson = focusPerson;
+    }
+
+    public String getJcjg() {
+        return jcjg;
+    }
+
+    public void setJcjg(String jcjg) {
+        this.jcjg = jcjg;
+    }
+
+    public String getFromCity() {
+        return fromCity;
+    }
+
+    public void setFromCity(String fromCity) {
+        this.fromCity = fromCity;
+    }
+
+    public String getJcdd() {
+        return jcdd;
+    }
+
+    public void setJcdd(String jcdd) {
+        this.jcdd = jcdd;
+    }
+
+    public String getCjdd() {
+        return cjdd;
+    }
+
+    public void setCjdd(String cjdd) {
+        this.cjdd = cjdd;
+    }
+
+    public String getToCity() {
+        return toCity;
+    }
+
+    public void setToCity(String toCity) {
+        this.toCity = toCity;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public String getZjhm() {
+        return zjhm;
+    }
+
+    public void setZjhm(String zjhm) {
+        this.zjhm = zjhm;
+    }
+
+    public String getCjsj() {
+        return cjsj;
+    }
+
+    public void setCjsj(String cjsj) {
+        this.cjsj = cjsj;
+    }
+
+    public String getCertificateNoType() {
+        return certificateNoType;
+    }
+
+    public void setCertificateNoType(String certificateNoType) {
+        this.certificateNoType = certificateNoType;
+    }
+
+    public String getXm() {
+        return xm;
+    }
+
+    public void setXm(String xm) {
+        this.xm = xm;
+    }
+
+    public String getTransit() {
+        return transit;
+    }
+
+    public void setTransit(String transit) {
+        this.transit = transit;
+    }
+
+    public String getCollectorName() {
+        return collectorName;
+    }
+
+    public void setCollectorName(String collectorName) {
+        this.collectorName = collectorName;
+    }
+
+    public String getCjssxq() {
+        return cjssxq;
+    }
+
+    public void setCjssxq(String cjssxq) {
+        this.cjssxq = cjssxq;
+    }
+
+    public String getMainKey() {
+        return mainKey;
+    }
+
+    public void setMainKey(String mainKey) {
+        this.mainKey = mainKey;
+    }
+
+    public String getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(String isDel) {
+        this.isDel = isDel;
+    }
+}

boman-web-core/src/main/java/com/boman/web/core/mapper/AccountingDataMapper.java

@@ -0,0 +1,26 @@
+package com.boman.web.core.mapper;
+/**
+ * @author tjf
+ * @Date: 2022/05/13/10:27
+ */
+
+import com.boman.web.core.domain.AccountingData;
+import com.boman.web.core.domain.vo.AccountingDataVo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+
+/**
+ * @author tjf
+ * @Date: 2022/05/13/10:27
+ */
+@Mapper
+public interface AccountingDataMapper {
+    /**
+     *
+     * @param accountingData
+     * @return
+     */
+   List<AccountingDataVo> selectAccountingDataList(AccountingData accountingData);
+}

boman-web-core/src/main/java/com/boman/web/core/service/accounting/AccountingDataServiceImpl.java

@@ -0,0 +1,35 @@
+package com.boman.web.core.service.accounting;
+/**
+ * @author tjf
+ * @Date: 2022/05/13/11:14
+ */
+
+import com.boman.web.core.domain.AccountingData;
+import com.boman.web.core.domain.vo.AccountingDataVo;
+import com.boman.web.core.mapper.AccountingDataMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author tjf
+ * @Date: 2022/05/13/11:14
+ */
+@Service
+public class AccountingDataServiceImpl implements IAccountingDataService{
+
+    @Resource
+    private AccountingDataMapper accountingDataMapper;
+
+    /**
+     * 潜山核酸数据列表页
+     * @param accountingData
+     * @return
+     */
+    @Override
+    public List<AccountingDataVo> nucleicAcidHJList(AccountingData accountingData) {
+        List<AccountingDataVo> list = accountingDataMapper.selectAccountingDataList(accountingData);
+        return list;
+    }
+}

boman-web-core/src/main/java/com/boman/web/core/service/accounting/IAccountingDataService.java

@@ -0,0 +1,19 @@
+package com.boman.web.core.service.accounting;
+
+import com.boman.web.core.domain.AccountingData;
+import com.boman.web.core.domain.vo.AccountingDataVo;
+
+import java.util.List;
+
+/**
+ * @author tjf
+ * @Date: 2022/05/13/11:13
+ */
+public interface IAccountingDataService {
+    /**
+     * 核酸检测列表
+     * @param accountingData
+     * @return
+     */
+    List<AccountingDataVo> nucleicAcidHJList(AccountingData accountingData);
+}

boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkServiceImpl.java

@@ -22,10 +22,7 @@ import com.boman.domain.utils.ThreadPoolService;
 import com.boman.system.api.RemoteDeptService;
 import com.boman.system.api.RemoteDictDataService;
 import com.boman.system.api.model.LoginUser;
-import com.boman.web.core.domain.BirthRecords;
-import com.boman.web.core.domain.ConfirmInfoUser;
-import com.boman.web.core.domain.GridInfo;
-import com.boman.web.core.domain.JsonRequest;
+import com.boman.web.core.domain.*;
 import com.boman.web.core.mapper.*;
 import com.boman.web.core.service.ip.IpTimesService;
 import com.boman.web.core.utils.*;
@@ -92,6 +89,8 @@ public class CzrkServiceImpl implements ICzrkService {
     @Resource
     private RemoteDictDataService remoteDictDataService;
     @Resource
+    private AccountingDataMapper accountingDataMapper;
+    @Resource
     BirthRecordsMapper birthRecordsMapper;
 
     /**
@@ -1281,85 +1280,6 @@ public class CzrkServiceImpl implements ICzrkService {
         return ajaxResult;
     }
 
-    @Override
-    public AjaxResult nucleicAcid(String xzqh, String djsjqs, String djsjjs, String name, String sfzhm) {
-
-        Map<String, String> paramMap = new HashMap<>();
-        String http = null;
-        //当区划为空的时候根据姓名，身份证查询
-        if(StringUtils.isNotEmpty(xzqh)){
-            //潜山核酸数据(区划 时间段)
-            paramMap.put("client_id","acdf50bd13be4901b64c62b1fee862c0");
-            paramMap.put("access_token","220f50ea48614caebae0fadcecb84a1e");
-            paramMap.put("xzqh",xzqh);
-            paramMap.put("djsjqs",djsjqs);
-            paramMap.put("djsjjs",djsjjs);
-
-            http = "http://172.27.189.244:9090/service/api/rkk/qshssjcx";
-        }else{
-            //潜山核酸数据(姓名 身份证 时间段)
-            paramMap.put("client_id","acdf50bd13be4901b64c62b1fee862c0");
-            paramMap.put("access_token","6c3434eeb63f4e7f83a6dd7c3e6db99e");
-            paramMap.put("name",name);
-            paramMap.put("sfzhm",sfzhm);
-            paramMap.put("djsjqs",djsjqs);
-            paramMap.put("djsjjs",djsjjs);
-
-            http = "http://172.27.189.244:9090/service/api/rkk/qshssj";
-        }
-
-        try {
-            if(StringUtils.isEmpty(http)){
-                return AjaxResult.error("参数错误");
-            }
-            String data = HttpClientUtils.doGet(http,paramMap);
-            JSONObject json = JSON.parseObject(data);
-            return AjaxResult.success("数据返回成功",json);
-        } catch (IOException e) {
-            e.printStackTrace();
-            return AjaxResult.error("数据返回失败");
-        }
-    }
-
-    @Override
-    public AjaxResult toQianshan(String rc, String djsjqs, String djsjjs, String name, String sfzhm) {
-        Map<String, String> paramMap = new HashMap<>();
-        String http = null;
-        //当区划为空的时候根据姓名，身份证查询
-        if(StringUtils.isNotEmpty(rc)){
-            //潜山来宜人员数据(区划 时间段)
-            paramMap.put("client_id","acdf50bd13be4901b64c62b1fee862c0");
-            paramMap.put("access_token","ac2a4c29d0054d98a5fcaf54becfd60d");
-            paramMap.put("xzqh",rc);
-            paramMap.put("djsjqs",djsjqs);
-            paramMap.put("djsjjs",djsjjs);
-
-            http = "http://172.27.189.244:9090/service/api/rkk/qslyrysj";
-        }else{
-            //潜山来宜人员数据(姓名 身份证 时间段)
-            paramMap.put("client_id","acdf50bd13be4901b64c62b1fee862c0");
-            paramMap.put("access_token","59e548b8bdaa42c2b9a3e3e65831181e");
-            paramMap.put("name",name);
-            paramMap.put("sfzhm",sfzhm);
-            paramMap.put("djsjqs",djsjqs);
-            paramMap.put("djsjjs",djsjjs);
-
-            http = "http://172.27.189.244:9090/service/api/rkk/qslyrysjcx";
-        }
-
-        try {
-            if(StringUtils.isEmpty(http)){
-                return AjaxResult.error("参数错误");
-            }
-            String data = HttpClientUtils.doGet(http,paramMap);
-            JSONObject json = JSON.parseObject(data);
-            return AjaxResult.success("数据返回成功",json);
-        } catch (IOException e) {
-            e.printStackTrace();
-            return AjaxResult.error("数据返回失败");
-        }
-    }
-
     @Override
     public Czrk getById(Long id) {
         if (isEmpty(id)) {

boman-web-core/src/main/java/com/boman/web/core/service/czrk/ICzrkService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.boman.domain.Czrk;
 import com.boman.domain.ThirdPartInfo;
 import com.boman.domain.dto.AjaxResult;
+import com.boman.web.core.domain.AccountingData;
 import com.boman.web.core.domain.JsonRequest;
 
 import java.util.List;
@@ -152,8 +153,4 @@ public interface ICzrkService {
     AjaxResult findXsInfo(String id, String idCard);
 
     AjaxResult addBabyCzrk(Czrk czrk);
-
-    AjaxResult nucleicAcid(String xzqh, String djsjqs, String djsjjs, String name, String sfzhm);
-
-    AjaxResult toQianshan(String rc, String djsjqs, String djsjjs, String name, String sfzhm);
 }

boman-web-core/src/main/resources/mapper/AccountingDateMapperxml

@@ -0,0 +1,55 @@
+<?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.boman.web.core.mapper.AccountingDataMapper">
+
+    <resultMap type="AccountingData" id="AccountingDataResult">
+        <result property="id"    column="id"    />
+        <result property="jcsj"    column="jcsj"    />
+        <result property="lxdh"    column="lxdh"    />
+        <result property="address"    column="address"    />
+        <result property="batcNumber"    column="batch_number"    />
+        <result property="focusPerson"    column="focus_person"    />
+        <result property="jcjg"    column="jcjg"    />
+        <result property="fromCity"    column="from_city"    />
+        <result property="jcdd"    column="jcdd"    />
+        <result property="cjdd"    column="cjdd"    />
+        <result property="toCity"    column="to_city"    />
+        <result property="source"    column="source"    />
+        <result property="zjhm"    column="zjhm"    />
+        <result property="cjsj"    column="cjsj"    />
+        <result property="certificateNoType"    column="certificate_no_type"    />
+        <result property="xm"    column="xm"    />
+        <result property="transit"    column="transit"    />
+        <result property="collectorName"    column="collector_name"    />
+        <result property="cjssxq"    column="cjssxq"    />
+        <result property="mainKey"    column="main_key"    />
+        <result property="modifyDate"    column="modify_date"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+
+        <!--以下是返回是需要使用-->
+        <result property="phoneNum"    column="phoneNum"    />
+        <result property="province"    column="province"    />
+        <result property="city"    column="city"    />
+        <result property="region"    column="region"    />
+        <result property="villageTowns"    column="villageTowns"    />
+        <result property="village"    column="village"    />
+        <result property="nowIn"    column="nowIn"    />
+        <result property="nowInSelect"    column="nowInSelect"    />
+        <result property="domicileSelect"    column="domicileSelect"    />
+        <result property="isNucleicAcid"    column="isNucleicAcid"    />
+    </resultMap>
+
+    <sql id="selectAccountingDataVo">
+        select d.id,d.jcsj, d.lxdh ,d.address, d.batch_number,d.focus_person,d.jcjg,d.from_city,d.jcdd,d.cjdd,d.to_city,d.source,d.zjhm,d.cjsj,d.certificate_no_type,d.xm,d.transit,d.collector_name,d.cjssxq,d.main_key,d.modify_date, d.create_by, d.create_time, d.update_by, d.update_time from accounting_data d
+    </sql>
+
+    <select id="selectAccountingDataList" parameterType="com.boman.web.core.domain.AccountingData" resultMap="AccountingDataResult">
+
+    </select>
+</mapper>