企业信息管理搭建完成

src/main/java/com/hz/employmentsite/controller/baseSettings/InstitutionController.java

@@ -1,17 +1,15 @@
 package com.hz.employmentsite.controller.baseSettings;
 
-import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.util.ExcelHelper;
-import com.hz.employmentsite.vo.baseSettings.SiteInfoModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.hz.employmentsite.services.service.baseSettings.InstitutionService;
 import com.hz.employmentsite.services.service.baseSettings.SiteInfoService;
 import com.hz.employmentsite.services.service.AccountService;
-import com.hz.employmentsite.vo.baseSettings.InstitutionModel;
+import com.hz.employmentsite.vo.baseSettings.InstitutionVo;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
@@ -34,11 +32,11 @@ public class InstitutionController {
 
     @ResponseBody
     @GetMapping("/getList")
-    public BaseResponse<PageInfo<InstitutionModel>> getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
-                                                            @RequestParam(required = false) String primaryKey, @RequestParam(required = false) String companyName,
-                                                            @RequestParam(required = false) String companyAddress,@RequestParam(required = false) String dutyUserName) {
+    public BaseResponse<PageInfo<InstitutionVo>> getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
+                                                         @RequestParam(required = false) String primaryKey, @RequestParam(required = false) String companyName,
+                                                         @RequestParam(required = false) String companyAddress, @RequestParam(required = false) String dutyUserName) {
 
-        PageInfo<InstitutionModel> result = institutionService.getList(pageIndex,pageSize,primaryKey,companyName,companyAddress,dutyUserName);
+        PageInfo<InstitutionVo> result = institutionService.getList(pageIndex,pageSize,primaryKey,companyName,companyAddress,dutyUserName);
 
         return RespGenerstor.success(result);
     }
@@ -46,8 +44,8 @@ public class InstitutionController {
 
 
     @GetMapping("get")
-    public BaseResponse<InstitutionModel> get(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,@RequestParam(required = false) String institutionID) {
-        InstitutionModel dataModel = new  InstitutionModel();
+    public BaseResponse<InstitutionVo> get(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize, @RequestParam(required = false) String institutionID) {
+        InstitutionVo dataModel = new InstitutionVo();
         if (institutionID == null || institutionID == ""){
             dataModel.institutionID = UUID.randomUUID().toString();
             dataModel.manageSites = null;
@@ -59,7 +57,7 @@ public class InstitutionController {
     }
 
     @PostMapping("save")
-    public BaseResponse<Integer> save(@RequestBody InstitutionModel  data) {
+    public BaseResponse<Integer> save(@RequestBody InstitutionVo data) {
         return RespGenerstor.success(institutionService.save(data,accountService.getLoginUserID()));
     }
 
@@ -69,7 +67,7 @@ public class InstitutionController {
                                @RequestParam(required = false) String szkey, @RequestParam(required = false) String companyName,
                                @RequestParam(required = false) String companyAddress,@RequestParam(required = false) String dutyUserName) throws Exception{
 
-        PageInfo<InstitutionModel> result = institutionService.getList(page,rows,szkey,companyName,companyAddress,dutyUserName);
+        PageInfo<InstitutionVo> result = institutionService.getList(page,rows,szkey,companyName,companyAddress,dutyUserName);
         if (isExport == null || !isExport) {
             return RespGenerstor.success(result);
         } else {
@@ -77,7 +75,7 @@ public class InstitutionController {
             data.setTitles(Arrays.asList(new String[]{"序号","年级","问题反馈日期", "学院", "问题描述","问题特性", "解决方案", "是否解决", "解决时间", "登记人"}));
             int i = 0;
             List<List<Object>> rowDatas = new ArrayList();
-            for (InstitutionModel item : result.getList()) {
+            for (InstitutionVo item : result.getList()) {
                 List<Object> row = new ArrayList();
                 ++i;
                 row.add(i);

src/main/java/com/hz/employmentsite/controller/baseSettings/SiteInfoController.java

@@ -4,7 +4,7 @@ import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.util.ExcelHelper;
-import com.hz.employmentsite.vo.baseSettings.SiteInfoModel;
+import com.hz.employmentsite.vo.baseSettings.SiteInfoVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.hz.employmentsite.services.service.baseSettings.SiteInfoService;
@@ -25,12 +25,12 @@ public class SiteInfoController {
 
     @ResponseBody
     @GetMapping("/getList")
-    public BaseResponse<PageInfo<SiteInfoModel>> getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
-                                                         @RequestParam(required = false) String primaryKey, @RequestParam(required = false) String siteCode,
-                                                         @RequestParam(required = false) String siteName, @RequestParam(required = false) String institutionName,
-                                                         @RequestParam(required = false) String regionCode, @RequestParam(required = false) String streetCode) {
+    public BaseResponse<PageInfo<SiteInfoVo>> getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
+                                                      @RequestParam(required = false) String primaryKey, @RequestParam(required = false) String siteCode,
+                                                      @RequestParam(required = false) String siteName, @RequestParam(required = false) String institutionName,
+                                                      @RequestParam(required = false) String regionCode, @RequestParam(required = false) String streetCode) {
 
-        PageInfo<SiteInfoModel> result = siteService.getList(pageIndex,pageSize,primaryKey,siteCode,siteName,institutionName,regionCode,streetCode);
+        PageInfo<SiteInfoVo> result = siteService.getList(pageIndex,pageSize,primaryKey,siteCode,siteName,institutionName,regionCode,streetCode);
 
         return RespGenerstor.success(result);
     }

src/main/java/com/hz/employmentsite/controller/baseSettings/UserInfoController.java

@@ -6,7 +6,7 @@ import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.services.service.AccountService;
 import com.hz.employmentsite.services.service.baseSettings.UserInfoService;
 import com.hz.employmentsite.util.ExcelHelper;
-import com.hz.employmentsite.vo.baseSettings.UserInfoModel;
+import com.hz.employmentsite.vo.baseSettings.UserInfoVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -25,10 +25,10 @@ public class UserInfoController {
 
     @ResponseBody
     @GetMapping("/getList")
-    public BaseResponse<PageInfo<UserInfoModel>> getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
-                                                         @RequestParam(required = false) String primaryKey,@RequestParam(required = false) String userName) {
+    public BaseResponse<PageInfo<UserInfoVo>> getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
+                                                      @RequestParam(required = false) String primaryKey, @RequestParam(required = false) String userName) {
 
-        PageInfo<UserInfoModel> result = userInfoService.getList(pageIndex,pageSize, primaryKey,userName);
+        PageInfo<UserInfoVo> result = userInfoService.getList(pageIndex,pageSize, primaryKey,userName);
 
         return RespGenerstor.success(result);
     }

src/main/java/com/hz/employmentsite/controller/companyService/CompanyController.java

@@ -1,18 +1,15 @@
 package com.hz.employmentsite.controller.companyService;
 
-import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.util.ExcelHelper;
-import com.hz.employmentsite.vo.baseSettings.SiteInfoModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.hz.employmentsite.services.service.companyService.CompanyService;
 import com.hz.employmentsite.services.service.AccountService;
 import com.hz.employmentsite.vo.companyService.CompanyVo;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 
 @RestController

src/main/java/com/hz/employmentsite/mapper/cquery/InstitutionCQuery.java

@@ -1,13 +1,13 @@
 package com.hz.employmentsite.mapper.cquery;
 
-import com.hz.employmentsite.vo.baseSettings.InstitutionModel;
+import com.hz.employmentsite.vo.baseSettings.InstitutionVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface InstitutionCQuery {
 
-    List<InstitutionModel> getList(@Param("primaryKey") String primaryKey, @Param("companyName") String companyName,
-                                             @Param("companyAddress") String companyAddress,@Param("dutyUserName") String dutyUserName);
+    List<InstitutionVo> getList(@Param("primaryKey") String primaryKey, @Param("companyName") String companyName,
+                                @Param("companyAddress") String companyAddress, @Param("dutyUserName") String dutyUserName);
 
 }

src/main/java/com/hz/employmentsite/mapper/cquery/SiteInfoCQuery.java

@@ -1,14 +1,14 @@
 package com.hz.employmentsite.mapper.cquery;
 
-import com.hz.employmentsite.vo.baseSettings.SiteInfoModel;
+import com.hz.employmentsite.vo.baseSettings.SiteInfoVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface SiteInfoCQuery {
-    List<SiteInfoModel> getList(@Param("primaryKey") String primaryKey, @Param("siteCode") String siteCode,
-                                @Param("siteName") String siteName, @Param("institutionName") String institutionName,
-                                @Param("regionCode") String regionCode, @Param("streetCode") String streetCode);
+    List<SiteInfoVo> getList(@Param("primaryKey") String primaryKey, @Param("siteCode") String siteCode,
+                             @Param("siteName") String siteName, @Param("institutionName") String institutionName,
+                             @Param("regionCode") String regionCode, @Param("streetCode") String streetCode);
 
-    List<SiteInfoModel> getListByInstitutionID(@Param("institutionID") String institutionID);
+    List<SiteInfoVo> getListByInstitutionID(@Param("institutionID") String institutionID);
 }

src/main/java/com/hz/employmentsite/mapper/cquery/UserInfoCQuery.java

@@ -1,11 +1,11 @@
 package com.hz.employmentsite.mapper.cquery;
 
-import com.hz.employmentsite.vo.baseSettings.UserInfoModel;
+import com.hz.employmentsite.vo.baseSettings.UserInfoVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface UserInfoCQuery {
-    List<UserInfoModel> getList(@Param("primaryKey") String primaryKey, @Param("userName") String userName);
+    List<UserInfoVo> getList(@Param("primaryKey") String primaryKey, @Param("userName") String userName);
 
 }

src/main/java/com/hz/employmentsite/services/impl/baseSettings/InstitutionImpl.java

@@ -1,6 +1,5 @@
 package com.hz.employmentsite.services.impl.baseSettings;
 
-import com.alibaba.druid.sql.ast.statement.SQLPrimaryKey;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.mapper.PcInstitutionMapper;
@@ -9,7 +8,7 @@ import com.hz.employmentsite.model.PcInstitution;
 import com.hz.employmentsite.model.PcInstitutionExample;
 import com.hz.employmentsite.services.service.baseSettings.InstitutionService;
 import com.hz.employmentsite.util.StringUtils;
-import com.hz.employmentsite.vo.baseSettings.InstitutionModel;
+import com.hz.employmentsite.vo.baseSettings.InstitutionVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -31,28 +30,28 @@ public class InstitutionImpl implements InstitutionService {
 
 
     @Override
-    public PageInfo<InstitutionModel> getList(int pageIndex, int pageSize, String primaryKey,String companyName,String companyAddress,String dutyUserName) {
+    public PageInfo<InstitutionVo> getList(int pageIndex, int pageSize, String primaryKey, String companyName, String companyAddress, String dutyUserName) {
         PageHelper.startPage(pageIndex, pageSize);
-        List<InstitutionModel> dataList = institutionCQuery.getList(primaryKey,companyName,companyAddress,dutyUserName);
-        PageInfo<InstitutionModel> result = new PageInfo(dataList);
+        List<InstitutionVo> dataList = institutionCQuery.getList(primaryKey,companyName,companyAddress,dutyUserName);
+        PageInfo<InstitutionVo> result = new PageInfo(dataList);
         return result;
     }
 
 
 
     @Override
-    public InstitutionModel get(String InstitutionID) {
+    public InstitutionVo get(String InstitutionID) {
         List<String> ids = new ArrayList<>();
         ids.add(InstitutionID);
         String sqlPrimaryKey = stringUtils.ListToInSql(ids);
-        InstitutionModel model = institutionCQuery.getList(sqlPrimaryKey,null,null ,null).stream().findFirst().orElse(null);
+        InstitutionVo model = institutionCQuery.getList(sqlPrimaryKey,null,null ,null).stream().findFirst().orElse(null);
         return model;
     }
 
     @Override
-    public Integer save(InstitutionModel data, String userId) {
+    public Integer save(InstitutionVo data, String userId) {
         int result = 0;
-        InstitutionModel record = get(data.institutionID);
+        InstitutionVo record = get(data.institutionID);
         PcInstitution dbData = record ==null ? null : pcInstitutionMapper.selectByPrimaryKey(record.institutionID);
         Boolean isExist = dbData != null;
         if (!isExist) {
@@ -63,9 +62,9 @@ public class InstitutionImpl implements InstitutionService {
             dbData.setCompanyName(data.getCompanyName());
             dbData.setCompanyAddress(data.getCompanyAddress());
             dbData.setFzrName(data.getFzrName());
-            dbData.setFzrMobile(data.getFzrName());
+            dbData.setFzrMobile(data.getFzrMobile());
             dbData.setFrName(data.getFrName());
-            dbData.setFrMobile(data.getFzrMobile());
+            dbData.setFrMobile(data.getFrMobile());
             dbData.setCompanyDesc(data.getCompanyDesc());
             dbData.setCreateUserID(userId);
             dbData.setCreateTime(new Date());
@@ -77,8 +76,8 @@ public class InstitutionImpl implements InstitutionService {
             dbData.setCompanyAddress(data.companyAddress);
             dbData.setFzrName(data.fzrName);
             dbData.setFzrMobile(data.fzrMobile);
-            dbData.setFrName(data.fzrName);
-            dbData.setFrMobile(data.fzrMobile);
+            dbData.setFrName(data.frName);
+            dbData.setFrMobile(data.frMobile);
             dbData.setCompanyDesc(data.companyDesc);
             dbData.setModifyUserID(userId);
             dbData.setModifyTime(new Date());

src/main/java/com/hz/employmentsite/services/impl/baseSettings/SiteInfoImpl.java

@@ -5,8 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.mapper.cquery.SiteInfoCQuery;
 import com.hz.employmentsite.services.service.baseSettings.SiteInfoService;
 import com.hz.employmentsite.util.StringUtils;
-import com.hz.employmentsite.vo.baseSettings.InstitutionModel;
-import com.hz.employmentsite.vo.baseSettings.SiteInfoModel;
+import com.hz.employmentsite.vo.baseSettings.SiteInfoVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -22,18 +21,18 @@ public class SiteInfoImpl implements SiteInfoService {
     private StringUtils stringUtils;
 
     @Override
-    public PageInfo<SiteInfoModel> getList(int pageIndex, int pageSize, String primaryKey, String siteCode, String siteName, String institutionName, String regionCode, String streetCode) {
+    public PageInfo<SiteInfoVo> getList(int pageIndex, int pageSize, String primaryKey, String siteCode, String siteName, String institutionName, String regionCode, String streetCode) {
         PageHelper.startPage(pageIndex, pageSize);
-        List<SiteInfoModel> dataList = siteInfoCQuery.getList(primaryKey,siteCode,siteName,institutionName,regionCode,streetCode);
-        PageInfo<SiteInfoModel> result = new PageInfo(dataList);
+        List<SiteInfoVo> dataList = siteInfoCQuery.getList(primaryKey,siteCode,siteName,institutionName,regionCode,streetCode);
+        PageInfo<SiteInfoVo> result = new PageInfo(dataList);
         return result;
     }
 
     @Override
-    public PageInfo<SiteInfoModel> getListByInstitutionID(int pageIndex, int pageSize,String institutionID) {
+    public PageInfo<SiteInfoVo> getListByInstitutionID(int pageIndex, int pageSize, String institutionID) {
         PageHelper.startPage(pageIndex, pageSize);
-        List<SiteInfoModel> dataList = siteInfoCQuery.getListByInstitutionID(institutionID);
-        PageInfo<SiteInfoModel> result = new PageInfo(dataList);
+        List<SiteInfoVo> dataList = siteInfoCQuery.getListByInstitutionID(institutionID);
+        PageInfo<SiteInfoVo> result = new PageInfo(dataList);
         return result;
     }
 

src/main/java/com/hz/employmentsite/services/impl/baseSettings/UserInfoImpl.java

@@ -5,7 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.mapper.cquery.UserInfoCQuery;
 import com.hz.employmentsite.services.service.baseSettings.UserInfoService;
 import com.hz.employmentsite.util.StringUtils;
-import com.hz.employmentsite.vo.baseSettings.UserInfoModel;
+import com.hz.employmentsite.vo.baseSettings.UserInfoVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -21,10 +21,10 @@ public class UserInfoImpl implements UserInfoService {
     private StringUtils stringUtils;
 
     @Override
-    public PageInfo<UserInfoModel> getList(int pageIndex, int pageSize, String primaryKey, String userName) {
+    public PageInfo<UserInfoVo> getList(int pageIndex, int pageSize, String primaryKey, String userName) {
         PageHelper.startPage(pageIndex, pageSize);
-        List<UserInfoModel> dataList = userInfoCQuery.getList(primaryKey,userName);
-        PageInfo<UserInfoModel> result = new PageInfo(dataList);
+        List<UserInfoVo> dataList = userInfoCQuery.getList(primaryKey,userName);
+        PageInfo<UserInfoVo> result = new PageInfo(dataList);
         return result;
     }
 

src/main/java/com/hz/employmentsite/services/service/baseSettings/InstitutionService.java

@@ -1,18 +1,17 @@
 package com.hz.employmentsite.services.service.baseSettings;
 
 import com.github.pagehelper.PageInfo;
-import com.hz.employmentsite.vo.baseSettings.InstitutionModel;
-import com.hz.employmentsite.vo.baseSettings.SiteInfoModel;
+import com.hz.employmentsite.vo.baseSettings.InstitutionVo;
 
 import java.util.List;
 
 public interface InstitutionService {
 
-    PageInfo<InstitutionModel> getList(int pageIndex,int pageSize, String primaryKey,String companyName,String companyAddress,String dutyUserName);
+    PageInfo<InstitutionVo> getList(int pageIndex, int pageSize, String primaryKey, String companyName, String companyAddress, String dutyUserName);
 
-    InstitutionModel get(String practiceTaskStudentID);
+    InstitutionVo get(String practiceTaskStudentID);
 
-    Integer save(InstitutionModel data, String userId);
+    Integer save(InstitutionVo data, String userId);
 
     Integer delete(List<String> idList);
 }

src/main/java/com/hz/employmentsite/services/service/baseSettings/SiteInfoService.java

@@ -1,13 +1,12 @@
 package com.hz.employmentsite.services.service.baseSettings;
 
 import com.github.pagehelper.PageInfo;
-import com.hz.employmentsite.vo.baseSettings.InstitutionModel;
-import com.hz.employmentsite.vo.baseSettings.SiteInfoModel;
+import com.hz.employmentsite.vo.baseSettings.SiteInfoVo;
 
 
 public interface SiteInfoService {
 
-    PageInfo<SiteInfoModel> getList(int pageIndex, int pageSize, String primaryKey, String siteCode, String siteName, String institutionName, String regionCode, String streetCode);
+    PageInfo<SiteInfoVo> getList(int pageIndex, int pageSize, String primaryKey, String siteCode, String siteName, String institutionName, String regionCode, String streetCode);
 
-    PageInfo<SiteInfoModel> getListByInstitutionID(int pageIndex, int pageSize, String institutionID);
+    PageInfo<SiteInfoVo> getListByInstitutionID(int pageIndex, int pageSize, String institutionID);
 }

src/main/java/com/hz/employmentsite/services/service/baseSettings/UserInfoService.java

@@ -1,11 +1,11 @@
 package com.hz.employmentsite.services.service.baseSettings;
 
 import com.github.pagehelper.PageInfo;
-import com.hz.employmentsite.vo.baseSettings.UserInfoModel;
+import com.hz.employmentsite.vo.baseSettings.UserInfoVo;
 
 
 public interface UserInfoService {
 
-    PageInfo<UserInfoModel> getList(int pageIndex, int pageSize, String primaryKey, String userName);
+    PageInfo<UserInfoVo> getList(int pageIndex, int pageSize, String primaryKey, String userName);
 
 }

src/main/java/com/hz/employmentsite/vo/baseSettings/InstitutionModel.java

@@ -2,11 +2,10 @@ package com.hz.employmentsite.vo.baseSettings;
 import lombok.Data;
 
 import java.sql.Time;
-import java.util.ArrayList;
 import java.util.List;
 
 @Data
-public class InstitutionModel {
+public class InstitutionVo {
 
     public String institutionID;
     public String companyCode;
@@ -20,7 +19,7 @@ public class InstitutionModel {
     public String frName;
     public String frMobile;
 
-    public List<SiteInfoModel> manageSites;
+    public List<SiteInfoVo> manageSites;
     public Integer siteCount;
 
     public String createUserID;

src/main/java/com/hz/employmentsite/vo/baseSettings/SiteInfoModel.java

@@ -4,7 +4,7 @@ import lombok.Data;
 import java.sql.Time;
 
 @Data
-public class SiteInfoModel {
+public class SiteInfoVo {
 
     public String siteID;
     public String siteCode;

src/main/java/com/hz/employmentsite/vo/baseSettings/UserInfoModel.java

@@ -3,7 +3,7 @@ import lombok.Data;
 import java.sql.Time;
 
 @Data
-public class UserInfoModel {
+public class UserInfoVo {
 
     public String userID;
     public Integer userTypeID;

src/main/resources/mapping/cquery/InstitutionCQuery.xml

@@ -1,7 +1,7 @@
 <?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.hz.employmentsite.mapper.cquery.InstitutionCQuery">
-    <select id="getList" resultType="com.hz.employmentsite.vo.baseSettings.InstitutionModel">
+    <select id="getList" resultType="com.hz.employmentsite.vo.baseSettings.InstitutionVo">
         select  B.*,Count(A.siteInstitutionID)as siteCount from pc_site_institution  A left join  pc_institution B on
         A.institutionID = B.institutionID  where 1=1
         <if test="primaryKey!='' and primaryKey!=null">

src/main/resources/mapping/cquery/SiteInfoCQuery.xml

@@ -1,7 +1,7 @@
 <?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.hz.employmentsite.mapper.cquery.SiteInfoCQuery">
-    <select id="getList" resultType="com.hz.employmentsite.vo.baseSettings.SiteInfoModel">
+    <select id="getList" resultType="com.hz.employmentsite.vo.baseSettings.SiteInfoVo">
         select  A.*,C.companyName as institutionName from pc_site A,pc_site_institution B,pc_institution C
         where A.SiteID = B.SiteID and B.institutionID = C.institutionID and 1=1
         <if test="primaryKey!='' and primaryKey!=null">
@@ -24,7 +24,7 @@
         </if>
     </select>
 
-    <select id="getListByInstitutionID" resultType="com.hz.employmentsite.vo.baseSettings.SiteInfoModel">
+    <select id="getListByInstitutionID" resultType="com.hz.employmentsite.vo.baseSettings.SiteInfoVo">
         select  A.* from pc_site A,pc_site_institution B,pc_institution C
         where A.siteID = B.siteID and B.institutionID = C.institutionID and 1=1
         <if test="institutionID!='' and institutionID!=null">

src/main/resources/mapping/cquery/UserInfoCQuery.xml

@@ -1,7 +1,7 @@
 <?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.hz.employmentsite.mapper.cquery.UserInfoCQuery">
-    <select id="getList" resultType="com.hz.employmentsite.vo.baseSettings.UserInfoModel">
+    <select id="getList" resultType="com.hz.employmentsite.vo.baseSettings.UserInfoVo">
         select A.*,B.name as userTypeName from sys_user A,(select * from  sys_dictionary_item where dictionaryCode ='UserType') B
         where A.userTypeID = B.value and 1=1
         <if test="primaryKey!='' and primaryKey!=null">

vue/src/views/baseSettings/site/index.vue

@@ -49,12 +49,12 @@
                :loading="formState.loading"
                @change="handleTableChange"
                :row-selection="{ selectedRowKeys: formState.selectedRowKeys, onChange: onSelectChange}"
-               :row-key="record=>record.szkey"
+               :row-key="record=>record.siteID"
                bordered>
         <template #bodyCell="{ column, text, record }">
           <template v-if="column.key === 'operation'">
             <div class="table-operation">
-              <a-button type="link" size="small" @click='onOperates(record.szkey.toString(),"修改",false)' >编辑</a-button>
+              <a-button type="link" size="small" @click='onOperates(record.siteID.toString(),"修改",false)' >编辑</a-button>
               <a-button type="link" size="small" @click="onDel(record)" >删除</a-button>
             </div>
           </template>
@@ -95,16 +95,16 @@ export default defineComponent({
       loading: false
     });
     const columns: TableColumnsType = [
-      {title: '序号', align: "center",key: 'szkey',customRender: item => `${searchParams.pageSize * (searchParams.pageIndex - 1) + item.index + 1}`},
-      {title: '驿站编号', dataIndex: 'SiteCode', key: 'SiteCode', align: "center"},
-      {title: '站点名称', dataIndex: 'SiteName', key: 'SiteName',width:120, align: "center"},
-      {title: '站点负责人', dataIndex: 'FzrName', key: 'FzrName', align: "center"},
-      {title: '联系电话', dataIndex: 'FzrMobile', key: 'FzrMobile', align: "center"},
-      {title: '所属县区', dataIndex: 'RegionCode', key: 'RegionCode', align: "center"},
-      {title: '所属街道', dataIndex: 'StreetCode', key: 'StreetCode', align: "center"},
-      {title: '详细地址', dataIndex: 'DetailAddress', key: 'DetailAddress', align: "center"},
-      {title: '所属机构', dataIndex: 'CompanyName', key: 'CompanyName', align: "center"},
-      {title: '驿站人员数量', key: 'UserNumber', fixed: 'right',width:170, align: "center"},
+      {title: '序号', align: "center",key: 'siteID',customRender: item => `${searchParams.pageSize * (searchParams.pageIndex - 1) + item.index + 1}`},
+      {title: '驿站编号', dataIndex: 'siteCode', key: 'siteCode', align: "center"},
+      {title: '站点名称', dataIndex: 'siteName', key: 'siteName',width:120, align: "center"},
+      {title: '站点负责人', dataIndex: 'fzrName', key: 'fzrName', align: "center"},
+      {title: '联系电话', dataIndex: 'fzrMobile', key: 'fzrMobile', align: "center"},
+      {title: '所属县区', dataIndex: 'regionCode', key: 'regionCode', align: "center"},
+      {title: '所属街道', dataIndex: 'streetCode', key: 'streetCode', align: "center"},
+      {title: '详细地址', dataIndex: 'detailAddress', key: 'detailAddress', align: "center"},
+      {title: '所属机构', dataIndex: 'institutionName', key: 'institutionName', align: "center"},
+      {title: '驿站人员数量',  dataIndex: 'userNumber',key: 'userNumber', fixed: 'right',width:170, align: "center"},
       {title: '操作', key: 'operation', fixed: 'right',width:170, align: "center"},
     ];
     const pagination = computed(() => ({

vue/src/views/companyService/company/index.vue

@@ -127,7 +127,6 @@ export default defineComponent({
       formState.loading = true;
       const result: any = await getList(searchParams);
       dataList.value = result.list;
-      console.log(dataList.value);
       formState.total = result.total;
       formState.loading = false;
     }