部分导出功能提交

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

@@ -68,41 +68,32 @@ public class InstitutionController {
     }
 
     @GetMapping("export")
-    public BaseResponse export(HttpServletResponse response,
-                               @RequestParam(required = false) Boolean isExport, @RequestParam("page") int page, @RequestParam("rows") int rows,
-                               @RequestParam(required = false) String szkey, @RequestParam(required = false) String companyName,
-                               @RequestParam(required = false) String companyAddress,@RequestParam(required = false) String dutyUserName) throws Exception{
-
-        PageInfo<InstitutionVo> result = institutionService.getList(page,rows,szkey,companyName,companyAddress,dutyUserName);
-        if (isExport == null || !isExport) {
-            return RespGenerstor.success(result);
-        } else {
-            ExcelHelper.ExcelData data = excelHelper.new ExcelData();
-            data.setTitles(Arrays.asList(new String[]{"序号","年级","问题反馈日期", "学院", "问题描述","问题特性", "解决方案", "是否解决", "解决时间", "登记人"}));
-            int i = 0;
-            List<List<Object>> rowDatas = new ArrayList();
-            for (InstitutionVo item : result.getList()) {
-                List<Object> row = new ArrayList();
-                ++i;
-                row.add(i);
-                row.add(item.companyCode);
-                row.add(item.companyCode);
-                row.add(item.fzrName);
-                row.add(item.fzrMobile);
-                row.add(item.frName);
-                row.add(item.frMobile);
-                row.add(item.companyAddress);
-                row.add(item.companyDesc);
-                row.add(item.createUserID);
-                row.add(item.createTime);
-                row.add(item.modifyUserID);
-                row.add(item.modifyTime);
-                rowDatas.add(row);
-            }
-            data.setRows(rowDatas);
-            excelHelper.exportExcel(response, data);
-            return null;
+    public BaseResponse export(HttpServletResponse response, @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) throws Exception{
+
+        PageInfo<InstitutionVo> result = institutionService.getList(pageIndex,pageSize,primaryKey,companyName,companyAddress,dutyUserName);
+        ExcelHelper.ExcelData data = excelHelper.new ExcelData();
+        data.setTitles(Arrays.asList(new String[]{"序号","企业名称","企业地址", "负责人姓名", "负责人电话","法人姓名", "法人电话", "企业机构代码", "管理驿站数量"}));
+        int i = 0;
+        List<List<Object>> rowDatas = new ArrayList();
+        for (InstitutionVo item : result.getList()) {
+            List<Object> row = new ArrayList();
+            ++i;
+            row.add(i);
+            row.add(item.companyName);
+            row.add(item.companyAddress);
+            row.add(item.fzrName);
+            row.add(item.fzrMobile);
+            row.add(item.frName);
+            row.add(item.frMobile);
+            row.add(item.companyCode);
+            row.add(item.siteCount);
+            rowDatas.add(row);
         }
+        data.setRows(rowDatas);
+        excelHelper.exportExcel(response, data);
+        return null;
     }
 
     @ResponseBody

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

@@ -4,13 +4,15 @@ 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.InstitutionVo;
 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;
 import com.hz.employmentsite.services.service.AccountService;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
@@ -22,7 +24,7 @@ public class SiteInfoController {
     private AccountService accountService;
 
     @Autowired
-    private SiteInfoService siteService;
+    private SiteInfoService siteInfoService;
 
     @Autowired
     private ExcelHelper excelHelper;
@@ -34,14 +36,14 @@ public class SiteInfoController {
                                                       @RequestParam(required = false) String siteName, @RequestParam(required = false) String institutionName,
                                                       @RequestParam(required = false) String regionCode, @RequestParam(required = false) String streetCode) {
 
-        PageInfo<SiteInfoVo> result = siteService.getList(pageIndex,pageSize,primaryKey,siteCode,siteName,institutionName,regionCode,streetCode);
+        PageInfo<SiteInfoVo> result = siteInfoService.getList(pageIndex,pageSize,primaryKey,siteCode,siteName,institutionName,regionCode,streetCode);
 
         return RespGenerstor.success(result);
     }
 
     @PostMapping("getListByInstitutionID")
     public BaseResponse<Integer> getListByInstitutionID(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,@RequestParam(required = false) String institutionID) {
-        return RespGenerstor.success(siteService.getListByInstitutionID(pageIndex,pageSize, institutionID));
+        return RespGenerstor.success(siteInfoService.getListByInstitutionID(pageIndex,pageSize, institutionID));
     }
 
     @GetMapping("get")
@@ -50,7 +52,7 @@ public class SiteInfoController {
         if (siteID == null || siteID == ""){
             dataModel.siteID = UUID.randomUUID().toString();
         }else{
-            dataModel = siteService.get(siteID);
+            dataModel = siteInfoService.get(siteID);
         }
         dataModel.manageUsers = null;
         return RespGenerstor.success(dataModel);
@@ -59,14 +61,44 @@ public class SiteInfoController {
 
     @PostMapping("save")
     public BaseResponse<Integer> save(@RequestBody SiteInfoVo data) {
-        return RespGenerstor.success(siteService.save(data,accountService.getLoginUserID()));
+        return RespGenerstor.success(siteInfoService.save(data,accountService.getLoginUserID()));
     }
 
+    @GetMapping("export")
+    public BaseResponse export(HttpServletResponse response, @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) throws Exception{
+
+        PageInfo<SiteInfoVo> result = siteInfoService.getList(pageIndex,pageSize,primaryKey,siteCode,siteName,institutionName,regionCode,streetCode);
+        ExcelHelper.ExcelData data = excelHelper.new ExcelData();
+        data.setTitles(Arrays.asList(new String[]{"序号","驿站编号","站点名称", "站点负责人", "联系电话","所属县区", "所属街道", "详细地址", "所属机构","驿站人员数量"}));
+        int i = 0;
+        List<List<Object>> rowDatas = new ArrayList();
+        for (SiteInfoVo item : result.getList()) {
+            List<Object> row = new ArrayList();
+            ++i;
+            row.add(i);
+            row.add(item.siteCode);
+            row.add(item.siteName);
+            row.add(item.fzrName);
+            row.add(item.fzrMobile);
+            row.add(item.regionName);
+            row.add(item.streetName);
+            row.add(item.detailAddress);
+            row.add(item.institutionName);
+            row.add(item.userCount);
+            rowDatas.add(row);
+        }
+        data.setRows(rowDatas);
+        excelHelper.exportExcel(response, data);
+        return null;
+    }
 
     @ResponseBody
     @PostMapping("/delete")
     public BaseResponse<Integer> delete(@RequestBody List<String> idList){
-        return RespGenerstor.success(siteService.delete(idList));
+        return RespGenerstor.success(siteInfoService.delete(idList));
     }
 
 

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

@@ -11,7 +11,9 @@ import com.hz.employmentsite.vo.baseSettings.UserInfoVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
@@ -60,6 +62,30 @@ public class UserInfoController {
         return RespGenerstor.success(userInfoService.save(data,accountService.getLoginUserID()));
     }
 
+    @GetMapping("export")
+    public BaseResponse export(HttpServletResponse response, @RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
+                               @RequestParam(required = false) String primaryKey, @RequestParam(required = false) String userName) throws Exception{
+
+        PageInfo<UserInfoVo> result = userInfoService.getList(pageIndex,pageSize,primaryKey,userName);
+        ExcelHelper.ExcelData data = excelHelper.new ExcelData();
+        data.setTitles(Arrays.asList(new String[]{"序号","人员名称","角色", "性别", "联系电话"}));
+        int i = 0;
+        List<List<Object>> rowDatas = new ArrayList();
+        for (UserInfoVo item : result.getList()) {
+            List<Object> row = new ArrayList();
+            ++i;
+            row.add(i);
+            row.add(item.name);
+            row.add(item.roleName);
+            row.add(item.genderName);
+            row.add(item.mobile);
+            rowDatas.add(row);
+        }
+        data.setRows(rowDatas);
+        excelHelper.exportExcel(response, data);
+        return null;
+    }
+
     @ResponseBody
     @PostMapping("/delete")
     public BaseResponse<Integer> delete(@RequestBody List<String> idList){

src/main/java/com/hz/employmentsite/controller/taskAndLog/DoWorkController.java

@@ -5,10 +5,15 @@ import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.services.service.AccountService;
 import com.hz.employmentsite.services.service.taskAndLog.DoWorkService;
+import com.hz.employmentsite.util.ExcelHelper;
+import com.hz.employmentsite.vo.baseSettings.UserInfoVo;
 import com.hz.employmentsite.vo.taskAndLog.DoWorkVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
@@ -21,6 +26,9 @@ public class DoWorkController {
     @Autowired
     private DoWorkService doWorkService;
 
+    @Autowired
+    private ExcelHelper excelHelper;
+
     @ResponseBody
     @GetMapping("/getList")
     public BaseResponse getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize, @RequestParam(required = false) String primaryKey,
@@ -47,6 +55,32 @@ public class DoWorkController {
         return RespGenerstor.success(doWorkService.save(data,accountService.getLoginUserID()));
     }
 
+    @GetMapping("export")
+    public BaseResponse export(HttpServletResponse response, @RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize, @RequestParam(required = false) String primaryKey,
+                               @RequestParam(required = false) String userName,@RequestParam(required = false) String workStartDate,  @RequestParam(required = false) String workEndDate,
+                               @RequestParam(required = false) Integer doTypeID, @RequestParam(required = false) String regionCode,@RequestParam(required = false) String streetCode) throws Exception{
+        PageInfo<DoWorkVo> result = doWorkService.getList(pageIndex, pageSize,primaryKey, userName, workStartDate,workEndDate,doTypeID,regionCode,streetCode);
+        ExcelHelper.ExcelData data = excelHelper.new ExcelData();
+        data.setTitles(Arrays.asList(new String[]{"序号","姓名","工作日期", "日志类型", "工作情况","所属县区","所属街道"}));
+        int i = 0;
+        List<List<Object>> rowDatas = new ArrayList();
+        for (DoWorkVo item : result.getList()) {
+            List<Object> row = new ArrayList();
+            ++i;
+            row.add(i);
+            row.add(item.userName);
+            row.add(item.workTime);
+            row.add(item.logTypeName);
+            row.add(item.workContent);
+            row.add(item.regionName);
+            row.add(item.streetName);
+            rowDatas.add(row);
+        }
+        data.setRows(rowDatas);
+        excelHelper.exportExcel(response, data);
+        return null;
+    }
+
     @ResponseBody
     @PostMapping("/delete")
     public BaseResponse<Integer> delete(@RequestBody List<String> idList){

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

@@ -9,4 +9,6 @@ public interface SiteInstitutionCQuery {
 
     List<PcSiteInstitution> getListByInstitutionID(@Param("institutionID") String institutionID);
 
+    List<PcSiteInstitution> getListBySiteID(@Param("siteID") String siteID);
+
 }

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

@@ -105,7 +105,7 @@ public class InstitutionImpl implements InstitutionService {
             result = pcInstitutionMapper.updateByPrimaryKey(dbData);
         }
         /*先删除所有关联数据，再添加*/
-        var allExistData = siteInstitutionCQuery.getListByInstitutionID(data.getInstitutionID());
+        var allExistData = siteInstitutionCQuery.getListBySiteID(data.getInstitutionID());
         if (allExistData != null && allExistData.size() > 0){
             for(PcSiteInstitution curLinkData : allExistData) {
                 var siteInstitutionID = curLinkData.getSiteInstitutionID();

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

@@ -3,9 +3,9 @@ package com.hz.employmentsite.services.impl.baseSettings;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.mapper.PcSiteMapper;
-import com.hz.employmentsite.mapper.cquery.SiteInfoCQuery;
 import com.hz.employmentsite.mapper.PcSiteInstitutionMapper;
-import com.hz.employmentsite.model.PcInstitutionExample;
+import com.hz.employmentsite.mapper.cquery.SiteInfoCQuery;
+import com.hz.employmentsite.mapper.cquery.SiteInstitutionCQuery;
 import com.hz.employmentsite.model.PcSite;
 import com.hz.employmentsite.model.PcSiteExample;
 import com.hz.employmentsite.model.PcSiteInstitution;
@@ -26,6 +26,8 @@ public class SiteInfoImpl implements SiteInfoService {
     @Autowired
     private SiteInfoCQuery siteInfoCQuery;
 
+    @Autowired
+    private SiteInstitutionCQuery siteInstitutionCQuery;
 
     @Autowired
     private StringUtils stringUtils;
@@ -83,16 +85,6 @@ public class SiteInfoImpl implements SiteInfoService {
             dbData.setCreateUserID(userId);
             dbData.setCreateTime(new Date());
             result = pcSiteMapper.insert(dbData);
-            /*链接表数据添加*/
-            if (data.institutionID != null || data.institutionID !=""){
-                PcSiteInstitution insertLinkData =  new PcSiteInstitution();
-                insertLinkData.setSiteInstitutionID(UUID.randomUUID().toString());
-                insertLinkData.setSiteID(data.getSiteID());
-                insertLinkData.setInstitutionID(data.getInstitutionID());
-                insertLinkData.setCreateTime(new Date());
-                insertLinkData.setCreateUserID(userId);
-                result += pcSiteInstitutionMapper.insert(insertLinkData);
-            }
         } else {
             //修改
             dbData.setSiteID(data.siteID);
@@ -108,10 +100,24 @@ public class SiteInfoImpl implements SiteInfoService {
             dbData.setModifyUserID(userId);
             dbData.setModifyTime(new Date());
             result = pcSiteMapper.updateByPrimaryKey(dbData);
-            /*链接表数据修改*/
-            PcSiteInstitution updateLinkData = pcSiteInstitutionMapper.selectByPrimaryKey(data.siteInstitutionID);
-            updateLinkData.setInstitutionID(data.institutionID);
-            result += pcSiteInstitutionMapper.updateByPrimaryKey(updateLinkData);
+        }
+        /*先删除所有关联数据，再添加*/
+        var allExistData = siteInstitutionCQuery.getListBySiteID(data.getSiteID());
+        if (allExistData != null && allExistData.size() > 0){
+            for(PcSiteInstitution curLinkData : allExistData) {
+                var siteInstitutionID = curLinkData.getSiteInstitutionID();
+                result += pcSiteInstitutionMapper.deleteByPrimaryKey(siteInstitutionID);
+            }
+        }
+        /*链接表数据添加*/
+        if (data.institutionID != null || data.institutionID !=""){
+            PcSiteInstitution insertLinkData =  new PcSiteInstitution();
+            insertLinkData.setSiteInstitutionID(UUID.randomUUID().toString());
+            insertLinkData.setSiteID(data.getSiteID());
+            insertLinkData.setInstitutionID(data.getInstitutionID());
+            insertLinkData.setCreateTime(new Date());
+            insertLinkData.setCreateUserID(userId);
+            result += pcSiteInstitutionMapper.insert(insertLinkData);
         }
         return result;
     }

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

@@ -79,7 +79,6 @@ public class UserInfoImpl implements UserInfoService {
             result = pcSiteUserMapper.insert(dbData);
         } else {
             //修改
-
             dbData.setSiteUserID(data.siteUserID);
             dbData.setSiteID(data.getSiteID());
             dbData.setGender(data.gender);

src/main/java/com/hz/employmentsite/services/impl/taskAndLog/DoWorkImpl.java

@@ -2,15 +2,20 @@ package com.hz.employmentsite.services.impl.taskAndLog;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.hz.employmentsite.filter.exception.BaseResponse;
+import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.mapper.PcDoworkMapper;
 import com.hz.employmentsite.mapper.cquery.DoWorkCQuery;
 import com.hz.employmentsite.model.PcDowork;
 import com.hz.employmentsite.model.PcDoworkExample;
 import com.hz.employmentsite.services.service.taskAndLog.DoWorkService;
 import com.hz.employmentsite.util.StringUtils;
+import com.hz.employmentsite.vo.baseSettings.SiteInfoVo;
 import com.hz.employmentsite.vo.taskAndLog.DoWorkVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.ArrayList;
 import java.util.Date;

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

@@ -13,7 +13,7 @@ public class UserInfoVo {
     public String genderName;
     public String mobile;
     public Integer roleID;
-    public String userTypeName;
+    public String roleName;
 
     public String createBy;
     public Date createTime;

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

@@ -7,4 +7,11 @@
             and institutionID like Concat('%',#{institutionID},'%')
         </if>
     </select>
+
+    <select id="getListBySiteID" resultType="com.hz.employmentsite.model.PcSiteInstitution">
+        select  *  from pc_site_institution  where 1=1
+        <if test="siteID!='' and siteID!=null">
+            and siteID like Concat('%',#{siteID},'%')
+        </if>
+    </select>
 </mapper>

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

@@ -2,7 +2,7 @@
 <!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.UserInfoVo">
-        select siteUser.*,dic_userRole.Name as userTypeName,dic_gender.Name as genderName  from pc_site_user siteUser
+        select siteUser.*,dic_userRole.Name as RoleName,dic_gender.Name as GenderName  from pc_site_user siteUser
         left join (select * from sys_dictionary_item where DictionaryCode ='SiteUserRole' ) dic_userRole  on siteUser.RoleID = dic_userRole.Value
         left join (select * from sys_dictionary_item where DictionaryCode ='Gender' ) dic_gender  on siteUser.Gender = dic_gender.Value
         where 1=1

vue/src/views/baseSettings/institution/index.vue

@@ -71,8 +71,7 @@
         <a-col :span="24" style="text-align: right">
 <!--functioncode="T014001"-->
           <a-button type="primary" html-type="submit" @click='onOperates(null,"新增",false)' >新增</a-button>
-<!--          <BExportExcel :title="'导出'" :filename="'问题台账记录'" :url="'stitution/export'"
-                        :params="{...searchParams,isExport: true, rows:100000}"></BExportExcel>-->
+          <BExportExcel :title="'导出'" :filename="'运营机构信息'" :url="'/institution/export'" :params="{...searchParams, rows:100000}"></BExportExcel>
         </a-col>
       </a-row>
     </a-form>

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

@@ -57,7 +57,7 @@
         <a-col :span="24" style="text-align: right">
           <a-button type="primary" html-type="submit" @click='onOperates(null,"新增",false)' >新增</a-button>
           <a-button type="primary" >驿站地图</a-button>
-          <a-button type="primary" >导出</a-button>
+          <BExportExcel :title="'导出'" :filename="'驿站站点信息'" :url="'/siteInfo/export'" :params="{...searchParams, rows:100000}"></BExportExcel>
         </a-col>
       </a-row>
     </a-form>

vue/src/views/baseSettings/user/index.vue

@@ -21,6 +21,7 @@
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
           <a-button type="primary" html-type="submit" @click='onOperates(null,"新增",false)' >新增</a-button>
+          <BExportExcel :title="'导出'" :filename="'驿站人员信息'" :url="'/userInfo/export'" :params="{...searchParams, rows:100000}"></BExportExcel>
         </a-col>
       </a-row>
     </a-form>

vue/src/views/taskAndLog/dowork/index.vue

@@ -57,7 +57,7 @@
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
           <a-button type="primary" html-type="submit" @click='onOperates(null,"新增",false)'>新增</a-button>
-          <a-button type="primary" html-type="submit" @click='exportPost()'>导出</a-button>
+          <BExportExcel :title="'导出'" :filename="'工作日志信息'" :url="'/doWork/export'" :params="{...searchParams, rows:100000}"></BExportExcel>
         </a-col>
       </a-row>
     </a-form>