fix(ymt，tcm，jczs):企业、个人、设备可按监管单位导出

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-api/src/main/java/com/yeejoin/amos/boot/module/jczs/api/entity/PageParam.java

 package com.yeejoin.amos.boot.module.jczs.api.entity;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class PageParam {
 
 	int current = 0;

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-api/src/main/java/com/yeejoin/amos/boot/module/jczs/api/mapper/TzBaseEnterpriseInfoMapper.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jczs.api.dto.EquEnterDto;
 import com.yeejoin.amos.boot.module.jczs.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.jczs.api.entity.TzBaseEnterpriseInfo;
+import com.yeejoin.amos.boot.module.jczs.api.vo.BaseEnterpriseVo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 企业数据信息 Mapper 接口
@@ -45,4 +47,6 @@ public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseI
 	IPage<TzBaseEnterpriseInfoDto> page(Page<TzBaseEnterpriseInfoDto> page, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto);
 
 	IPage<TzBaseEnterpriseInfoDto> pageList(Page<TzBaseEnterpriseInfoDto> page, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto, List orgCodeList);
+
+	List<BaseEnterpriseVo> queryBaseEnterpriseInIds(@Param("ids") List<String> ids);
 }

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-api/src/main/java/com/yeejoin/amos/boot/module/jczs/api/service/ITzBaseEnterpriseInfoService.java

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.jczs.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.jczs.api.entity.PageParam;
 import com.yeejoin.amos.boot.module.jczs.api.entity.TzBaseEnterpriseInfo;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -44,4 +45,6 @@ public interface ITzBaseEnterpriseInfoService extends IService<TzBaseEnterpriseI
 	TzBaseEnterpriseInfoDto getInfoByUseCode(String useCode);
 
 	String setLabel(List<Long> enterpriseIds, List<String> enterpriseLabels);
+
+	void export(HttpServletResponse response, String ids,TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto);
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/vo/BaseEnterpriseVo.java → amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-api/src/main/java/com/yeejoin/amos/boot/module/jczs/api/vo/BaseEnterpriseVo.java

-package com.yeejoin.amos.boot.module.tcm.api.vo;
+package com.yeejoin.amos.boot.module.jczs.api.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

@@ -146,6 +146,24 @@
          order by rec_date desc
 	</select>
 
+	<select id="queryBaseEnterpriseInIds" resultType="com.yeejoin.amos.boot.module.jczs.api.vo.BaseEnterpriseVo">
+		SELECT
+		*,
+		CONCAT(province,'/',city,'/',district) AS region,
+		CONCAT(street,'/',address) AS full_address
+		FROM
+		tz_base_enterprise_info
+		<where>
+			<if test='ids != null'>
+				and sequence_nbr in
+				<foreach collection="ids" item="id" open="(" close=")" separator=",">
+					#{id}
+				</foreach>
+			</if>
+		</where>
+		order by rec_date desc
+	</select>
+
 	<select id="selectByUseUnit" resultType="com.yeejoin.amos.boot.module.jczs.api.entity.TzBaseEnterpriseInfo">
 		select * from tz_base_enterprise_info where use_unit = #{useUnit}
 	</select>

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-biz/src/main/java/com/yeejoin/amos/boot/module/jczs/biz/controller/TzBaseEnterpriseInfoController.java

@@ -27,6 +27,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -249,4 +250,11 @@ public class TzBaseEnterpriseInfoController {
         return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.setLabel(enterpriseIds, enterpriseLabel));
 
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/export")
+    @ApiOperation(httpMethod = "GET", value = "企业信息列表数据导出", notes = "企业信息列表数据导出")
+    public void baseEnterpriseExport(HttpServletResponse response, String ids, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto) {
+        iTzBaseEnterpriseInfoService.export(response, ids, tzBaseEnterpriseInfoDto);
+    }
 }

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-biz/src/main/java/com/yeejoin/amos/boot/module/jczs/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.jczs.api.dto.BaseUnitLicenceDto;
@@ -20,6 +21,7 @@ import com.yeejoin.amos.boot.module.jczs.api.entity.SpeUseUnit;
 import com.yeejoin.amos.boot.module.jczs.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.jczs.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.boot.module.jczs.api.service.ITzBaseEnterpriseInfoService;
+import com.yeejoin.amos.boot.module.jczs.api.vo.BaseEnterpriseVo;
 import com.yeejoin.amos.boot.module.jczs.biz.utils.RedisUtil;
 import com.yeejoin.amos.boot.module.jczs.flc.api.dto.RegUnitIcDto;
 import com.yeejoin.amos.boot.module.jczs.flc.api.dto.RegUnitInfoDto;
@@ -38,8 +40,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
@@ -575,4 +579,23 @@ public class TzBaseEnterpriseInfoServiceImpl
         return map;
     }
 
+    	/**
+	 * 企业信息列表数据导出
+	 *
+	 * @param response 响应
+	 * @param ids 数据id
+	 */
+    @Override
+    public void export(HttpServletResponse response, String ids, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto) {
+        List<BaseEnterpriseVo> exportData;
+        if (StringUtils.isEmpty(ids)) { // 前端不选行，导出列表所有的数据
+            IPage<TzBaseEnterpriseInfoDto> page = this.page(new PageParam(1,Integer.MAX_VALUE), tzBaseEnterpriseInfoDto);
+            exportData =JSON.parseArray(JSON.toJSONString(page.getRecords()), BaseEnterpriseVo.class) ;
+        } else { // 前端选行，导出所选行的数据
+            List<String> idsList = Arrays.asList(ids.split(","));
+            exportData = this.baseMapper.queryBaseEnterpriseInIds(idsList);
+        }
+        ExcelUtil.createTemplate(response, "企业信息列表数据", "企业信息列表", exportData, BaseEnterpriseVo.class, null, false);
+    }
+
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/mapper/TzBaseEnterpriseInfoMapper.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.tcm.api.dto.EquEnterDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo;
-import com.yeejoin.amos.boot.module.tcm.api.vo.BaseEnterpriseVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -57,6 +56,4 @@ public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseI
 	List<Map<String, Object>> getEquipType(@Param("type")String type);
 
     Map<String, Object> getProblemInfoBySourceId(@Param("sourceId")String sourceId);
-
-	List<BaseEnterpriseVo> queryBaseEnterpriseInIds(@Param("ids") List<String> ids);
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/service/ITzBaseEnterpriseInfoService.java

@@ -51,6 +51,4 @@ public interface ITzBaseEnterpriseInfoService extends IService<TzBaseEnterpriseI
 	BaseUnitLicence getUnitLicenceMessage(String unitCode);
 
 	Map<String, Object> getInfoByUseCodeMap(String useCode);
-
-	void export(HttpServletResponse response, List<String> ids);
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/vo/JGUserInfoVo.java

+package com.yeejoin.amos.boot.module.tcm.api.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+/**
+ * 监管账号下的人员列表
+ */
+@Data
+public class JGUserInfoVo {
+    
+    @ExcelProperty(value = "资质状态", index = 0)
+    String permissionStatus;
+    
+    @ExcelProperty(value = "区域", index = 1)
+    String fullAddress;
+    
+    @ExcelProperty(value = "人员类型", index = 2)
+    String postName;
+    
+    @ExcelProperty(value = "姓名", index = 3)
+    String name;
+    
+    @ExcelProperty(value = "证件编号", index = 4)
+    String certificateNum;
+    
+    @ExcelProperty(value = "所在单位", index = 5)
+    String useUnit;
+
+}

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

@@ -176,22 +176,4 @@
 		select * from tzs_safety_problem_tracing where source_id = #{sourceId} order by rec_date desc limit 1
 	</select>
 
-	<select id="queryBaseEnterpriseInIds" resultType="com.yeejoin.amos.boot.module.tcm.api.vo.BaseEnterpriseVo">
-		SELECT
-		*,
-		CONCAT(province,'/',city,'/',district) AS region,
-		CONCAT(street,'/',address) AS full_address
-		FROM
-		tz_base_enterprise_info
-		<where>
-			<if test='ids != null'>
-				and sequence_nbr in
-				<foreach collection="ids" item="id" open="(" close=")" separator=",">
-					#{id}
-				</foreach>
-			</if>
-		</where>
-		order by rec_date desc
-	</select>
-
 </mapper>

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzBaseEnterpriseInfoController.java

@@ -297,12 +297,4 @@ public class TzBaseEnterpriseInfoController extends BaseController {
     public ResponseModel<BaseUnitLicence> getUnitLicenceMessage(@RequestParam("unitCode") String unitCode) {
         return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.getUnitLicenceMessage(unitCode));
     }
-
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/export")
-    @ApiOperation(httpMethod = "GET", value = "企业信息列表数据导出", notes = "企业信息列表数据导出")
-    public void baseEnterpriseExport(HttpServletResponse response, String ids) {
-        Assert.hasText(ids,"未选择导出数据");
-        iTzBaseEnterpriseInfoService.export(response, Arrays.asList(ids.split(",")));
-    }
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzsUserInfoController.java

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.UserPermissionDto;
@@ -17,6 +18,7 @@ import com.yeejoin.amos.boot.module.tcm.api.dto.TzsEquipListDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzsUserInfo;
 import com.yeejoin.amos.boot.module.tcm.api.service.ITzsUserInfoService;
+import com.yeejoin.amos.boot.module.tcm.api.vo.JGUserInfoVo;
 import com.yeejoin.amos.boot.module.tcm.biz.service.impl.TzsUserInfoServiceImpl;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
@@ -331,9 +333,22 @@ public class TzsUserInfoController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/export")
-    @ApiOperation(httpMethod = "GET", value = "人员列表列表数据导出", notes = "人员列表列表数据导出")
+    @ApiOperation(httpMethod = "GET", value = "人员管理列表数据导出", notes = "人员管理列表数据导出")
     public void userInfoExport(HttpServletResponse response, String ids) {
         Assert.hasText(ids,"未选择导出数据");
         tzsUserInfoService.userInfoExport(response, Arrays.asList(ids.split(",")));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "导出指定类型的下的人--监管账号下的人员列表", notes = "导出指定类型的下的人--监管账号下的人员列表")
+    @PostMapping(value = "/jg/export")
+    public void jgUserInfoExport(HttpServletResponse response,
+                                 @RequestParam(required = false, defaultValue = "all") String type,
+                                 @RequestBody UserPermissionDto filter) {
+        filter.setOrgCode(getSelectedOrgInfo().getCompany().getOrgCode());
+        filter.setCityCode(getSelectedOrgInfo().getCompany().getCompanyCode());
+        Page<UserPermissionDto> userPermissionDtos = tzsUserInfoServiceImpl.getUserByPermission(1, Long.MAX_VALUE, type, filter);
+        List<JGUserInfoVo> exportData = JSON.parseArray(JSON.toJSONString(userPermissionDtos.getRecords()), JGUserInfoVo.class);
+        ExcelUtil.createTemplate(response, "人员列表数据", "人员列表", exportData, JGUserInfoVo.class, null, false);
+    }
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -29,7 +29,6 @@ import com.yeejoin.amos.boot.module.tcm.api.enums.UnitTypeEnum;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserInfoMapper;
 import com.yeejoin.amos.boot.module.tcm.api.service.ITzBaseEnterpriseInfoService;
-import com.yeejoin.amos.boot.module.tcm.api.vo.BaseEnterpriseVo;
 import com.yeejoin.amos.boot.module.tcm.biz.utils.RedisUtil;
 import com.yeejoin.amos.boot.module.tcm.flc.api.dto.RegUnitIcDto;
 import com.yeejoin.amos.boot.module.tcm.flc.api.dto.RegUnitInfoDto;
@@ -60,6 +59,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.exception.instance.TooManyRequests;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.util.*;
@@ -118,7 +118,6 @@ public class TzBaseEnterpriseInfoServiceImpl
     private EquipmentCategoryServiceImpl equipmentCategoryService;
 	@Autowired
 	private TzsUserInfoServiceImpl userInfoService;
-
 	@Autowired
 	private RedissonClient redissonClient;
 
@@ -967,18 +966,4 @@ public class TzBaseEnterpriseInfoServiceImpl
 
 	}
 
-
-	/**
-	 * 企业信息列表数据导出
-	 *
-	 * @param response 响应
-	 * @param ids 数据id
-	 */
-	@Override
-	public void export(HttpServletResponse response, List<String> ids) {
-		List<BaseEnterpriseVo> exportData = this.baseMapper.queryBaseEnterpriseInIds(ids);
-		ExcelUtil.createTemplate(response, "企业信息列表数据", "企业信息列表", exportData, BaseEnterpriseVo.class, null, false);
-	}
-
-
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java

@@ -958,7 +958,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
     @Override
     public void userInfoExport(HttpServletResponse response, List<String> ids) {
         List<UserInfoVo> exportData = tzsUserInfoMapper.queryUserInfoInIds(ids);
-        ExcelUtil.createTemplate(response, "人员列表列表数据", "人员列表列表", exportData, UserInfoVo.class, null, false);
+        ExcelUtil.createTemplate(response, "人员列表数据", "人员列表", exportData, UserInfoVo.class, null, false);
     }
 
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -2142,6 +2142,12 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             meBuilder.must(QueryBuilders.matchPhraseQuery("SEQUENCE_NBR", "*" + test + "*"));
             boolMust.must(meBuilder);
         }
+        if (!ObjectUtils.isEmpty(map.getString("ORG_BRANCH_CODE"))) {
+            BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString("ORG_BRANCH_CODE"));
+            meBuilder.must(QueryBuilders.matchPhraseQuery("ORG_BRANCH_CODE", "*" + test + "*"));
+            boolMust.must(meBuilder);
+        }
         if (!ObjectUtils.isEmpty(map.getString("USE_UNIT_NAME"))) {
             BoolQueryBuilder query = QueryBuilders.boolQuery();
             String test = QueryParser.escape(map.getString("USE_UNIT_NAME"));