feat(base): 添加站点数据查询功能

- 在BaseController中新增getSiteDataActive接口
- 添加SiteData实体类定义站点相关字段
- 在BaseMapper中增加getSiteDataActive数据访问方法
- 在BaseService和BaseServiceImpl中实现站点数据查询逻辑
- 在BaseMapper.xml中添加站点数据查询SQL语句
- 添加HashMap和Map导入支持数据处理

src/main/java/com/xujie/modules/base/controller/BaseController.java

@@ -4,6 +4,7 @@ import com.xujie.common.utils.R;
 import com.xujie.modules.base.data.BuData;
 import com.xujie.modules.base.entity.BaseQuarter;
 import com.xujie.modules.base.entity.RoleUserData;
+import com.xujie.modules.base.entity.SiteData;
 import com.xujie.modules.base.service.BaseService;
 import com.xujie.modules.factory.entity.vo.BusinessRoleVo;
 import com.xujie.modules.oss.entity.SysOssEntity;
@@ -14,7 +15,9 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author rq
@@ -116,4 +119,21 @@ public class BaseController extends AbstractController {
         List<BaseQuarter> rows= baseService.getBaseQuarterRecently(inData);
         return R.ok().put("rows",rows);
     }
+
+
+    @PostMapping(value = "/getSiteDataActive")
+    @ResponseBody
+    public Object getSiteDataActive(@RequestBody SiteData inData) {
+        Map<String, Object> map = new HashMap<>();
+        try {
+            List<SiteData> result = baseService.getSiteDataActive(inData);
+            map.put("success", true);
+            map.put("rows", result);
+            map.put("total", result.size());
+        } catch (Exception e) {
+            map.put("success", false);
+            map.put("msg", e.getMessage());
+        }
+        return map;
+    }
 }

src/main/java/com/xujie/modules/base/dao/BaseMapper.java

@@ -3,6 +3,7 @@ package com.xujie.modules.base.dao;
 import com.xujie.modules.base.data.BuData;
 import com.xujie.modules.base.entity.BaseQuarter;
 import com.xujie.modules.base.entity.RoleUserData;
+import com.xujie.modules.base.entity.SiteData;
 import com.xujie.modules.factory.entity.vo.BusinessRoleVo;
 
 import com.xujie.modules.srm.entity.SrmCurrency;
@@ -57,5 +58,5 @@ public interface BaseMapper {
     List<RoleUserData> getRoleUserList(RoleUserData inData);
 
     List<BaseQuarter> getBaseQuarterRecently(BaseQuarter data);
-
+    List<SiteData> getSiteDataActive(SiteData inData);
 }

src/main/java/com/xujie/modules/base/entity/SiteData.java

@@ -0,0 +1,228 @@
+package com.xujie.modules.base.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.ibatis.type.Alias;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+@Alias("SiteData")
+public class SiteData {
+    /**
+     *
+     */
+    private String siteID;
+
+    /**
+     *
+     */
+    private String siteName;
+
+    /**
+     *
+     */
+    private String siteNameE;
+
+    /**
+     *
+     */
+    private String address;
+
+    /**
+     *
+     */
+    private String addressE;
+
+    /**
+     *
+     */
+    private String contactName;
+
+    /**
+     *
+     */
+    private String postCode;
+
+    /**
+     *
+     */
+    private String email;
+
+    /**
+     *
+     */
+    private String faxNo;
+
+    /**
+     *
+     */
+    private String phoneNo;
+
+    /**
+     *
+     */
+    private String active;
+
+    /**
+     *
+     */
+    private int add;
+    private String website;
+
+    /**
+     *
+     */
+    private String companyID;
+    /**
+     *
+     */
+    private String companyName;
+
+    /**
+     *
+     */
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    @JsonFormat(pattern = "HH:mm:ss")
+    private Date shipTime;
+
+    /**
+     *
+     */
+    private String referenceCustomerID;
+
+    public String getSiteID() {
+        return siteID;
+    }
+
+    public void setSiteID(String siteID) {
+        this.siteID = siteID;
+    }
+
+    public String getSiteName() {
+        return siteName;
+    }
+
+    public void setSiteName(String siteName) {
+        this.siteName = siteName;
+    }
+
+    public String getSiteNameE() {
+        return siteNameE;
+    }
+
+    public void setSiteNameE(String siteNameE) {
+        this.siteNameE = siteNameE;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getAddressE() {
+        return addressE;
+    }
+
+    public void setAddressE(String addressE) {
+        this.addressE = addressE;
+    }
+
+    public String getContactName() {
+        return contactName;
+    }
+
+    public void setContactName(String contactName) {
+        this.contactName = contactName;
+    }
+
+    public String getPostCode() {
+        return postCode;
+    }
+
+    public void setPostCode(String postCode) {
+        this.postCode = postCode;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getFaxNo() {
+        return faxNo;
+    }
+
+    public void setFaxNo(String faxNo) {
+        this.faxNo = faxNo;
+    }
+
+    public String getPhoneNo() {
+        return phoneNo;
+    }
+
+    public void setPhoneNo(String phoneNo) {
+        this.phoneNo = phoneNo;
+    }
+
+    public String getActive() {
+        return active;
+    }
+
+    public void setActive(String active) {
+        this.active = active;
+    }
+
+    public String getWebsite() {
+        return website;
+    }
+
+    public void setWebsite(String website) {
+        this.website = website;
+    }
+
+    public String getCompanyID() {
+        return companyID;
+    }
+
+    public void setCompanyID(String companyID) {
+        this.companyID = companyID;
+    }
+
+    public Date getShipTime() {
+        return shipTime;
+    }
+
+    public void setShipTime(Date shipTime) {
+        this.shipTime = shipTime;
+    }
+
+    public String getReferenceCustomerID() {
+        return referenceCustomerID;
+    }
+
+    public void setReferenceCustomerID(String referenceCustomerID) {
+        this.referenceCustomerID = referenceCustomerID;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public int getAdd() {
+        return add;
+    }
+
+    public void setAdd(int add) {
+        this.add = add;
+    }
+}
+

src/main/java/com/xujie/modules/base/service/BaseService.java

@@ -4,6 +4,7 @@ package com.xujie.modules.base.service;
 import com.xujie.modules.base.data.BuData;
 import com.xujie.modules.base.entity.BaseQuarter;
 import com.xujie.modules.base.entity.RoleUserData;
+import com.xujie.modules.base.entity.SiteData;
 import com.xujie.modules.factory.entity.vo.BusinessRoleVo;
 import com.xujie.modules.oss.entity.SysOssEntity;
 import com.xujie.modules.sys.data.GetParamInData;
@@ -49,4 +50,5 @@ public interface BaseService {
     List<BuData> getSiteBuByUserNameRQ(BuData data);
 
     List<BaseQuarter> getBaseQuarterRecently(BaseQuarter data);
+    List<SiteData> getSiteDataActive(SiteData inData);
 }

src/main/java/com/xujie/modules/base/service/Impl/BaseServiceImpl.java

@@ -8,6 +8,7 @@ import com.xujie.modules.base.dao.BaseMapper;
 import com.xujie.modules.base.data.BuData;
 import com.xujie.modules.base.entity.BaseQuarter;
 import com.xujie.modules.base.entity.RoleUserData;
+import com.xujie.modules.base.entity.SiteData;
 import com.xujie.modules.base.service.BaseService;
 import com.xujie.modules.factory.entity.vo.BusinessRoleVo;
 import com.xujie.modules.oss.entity.SysOssEntity;
@@ -342,7 +343,11 @@ public class BaseServiceImpl implements BaseService {
         data.setEndDate(oneAndHalfYearLater);
         return baseMapper.getBaseQuarterRecently(data);
     }
-
+    @Override
+    public List<SiteData> getSiteDataActive(SiteData inData) {
+        List<SiteData> result = baseMapper.getSiteDataActive(inData);
+        return result;
+    }
     protected SysUserEntity getUser() {
         return (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
     }

src/main/resources/mapper/base/BaseMapper.xml

@@ -95,7 +95,14 @@
         left join site as c on a.site = c.siteid
         WHERE a.username = #{username}
     </select>
+    <select id="getSiteDataActive" resultType="SiteData">
+        Select siteid,sitename,sitename_e,address,address_e,contactname,postcode,email,faxno,phoneno,active,website,companyid,citem_code
+        from Site as T
+        <where>
+            and t.active='Y'
 
+        </where>
+    </select>
     <select id="getBaseQuarterRecently" resultType="BaseQuarter" parameterType="BaseQuarter">
         SELECT
         a.quarter,