导出模板增加页面必填项字段 及对应下拉列表数据

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java

@@ -16,6 +16,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -456,15 +457,36 @@ public class OrgPersonController extends BaseController {
  * **/
     /**
      * 根据bizOrgCode查询
-     * @param bizOrgCode
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getByBizOrgCode/list", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "根据bizOrgCode查询", notes = "根据bizOrgCode查询")
+    @ApiOperation(httpMethod = "GET", value = "查询当前单位或部门自己的人员列表 非父子级", notes = "根据bizOrgCode查询")
     public ResponseModel<List<OrgUsr>> personListByBizOrgCode(@RequestParam Map<String, Object> requestBody) {
-
-
         return ResponseHelper.buildResponse(iOrgUsrService.personListByBizOrgCode(  requestBody.containsKey("bizOrgCode") ? requestBody.get("bizOrgCode").toString()  :  null));
     }
+
+    /**
+     * 根据bizOrgCode查询
+     * @param bizOrgCode
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/listCompany/{bizOrgCode}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "查询当前单位或部门自己的人员列表 非父子级", notes = "根据bizOrgCode查询")
+    public List<OrgUsr>  listCompany(@PathVariable String bizOrgCode) {
+        LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(BaseEntity::getIsDelete,false);
+        wrapper.likeRight(OrgUsr::getBizOrgCode,bizOrgCode);
+        wrapper.eq(OrgUsr::getBizOrgType,"PERSON");
+        List<OrgUsr> orgUsrs = orgUsrMapper.selectList(wrapper);
+        for (OrgUsr orgUsr : orgUsrs) {
+            OrgUsr company = iOrgUsrService.getById(orgUsr.getParentId());
+            orgUsr.setParentName(company.getBizOrgName() == null? null:company.getBizOrgName());
+        }
+        return orgUsrs;
+    }
+
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/BuildingController.java

@@ -354,6 +354,15 @@ public class BuildingController extends AbstractBaseController {
 
     @ApiOperation(value = "查询指定单位的建筑树")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{bizOrgCode}/treeNew")
+    public List<BuildingTreeVo> buildingTreeNew(
+            @ApiParam(value = "单位编码") @PathVariable String bizOrgCode){
+        return buildService.getBuildingTreeInMyOrgCode(bizOrgCode);
+    }
+
+
+    @ApiOperation(value = "查询指定单位的建筑树")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/myTree")
     public List<BuildingTreeVo> buildingTreeByMyCompany(){
         ReginParams reginParams = getSelectedOrgInfo();
@@ -361,4 +370,13 @@ public class BuildingController extends AbstractBaseController {
         return buildService.getBuildingTreeInMyOrgCode(reginParams.getPersonIdentity().getBizOrgCode());
     }
 
+    @ApiOperation(value = "查询指定单位的建筑树")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/myTreeList")
+    public List<BuildingTreeVo> buildingTreeByMyCompanyToList(){
+        ReginParams reginParams = getSelectedOrgInfo();
+
+        return buildService.getBuildingTreeInMyOrgCodeList(reginParams.getPersonIdentity().getBizOrgCode());
+    }
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IBuilldService.java

@@ -339,6 +339,7 @@ public interface IBuilldService extends IService<Building> {
     List<BuildingTreeVo> getBuildingTreeInOrgCode(String bizOrgCode);
 
     List<BuildingTreeVo> getBuildingTreeInMyOrgCode(String bizOrgCode);
+    List<BuildingTreeVo> getBuildingTreeInMyOrgCodeList(String bizOrgCode);
 
     List<OrgMenuDto> companyTreeByUserAndType();
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java

@@ -957,7 +957,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
                 }
             }
             x.setVedioFormat(vedioFormat);
-            x.setUrl(videoService.getVideoUrl(x.getName(), x.getPresetPosition(), x.getUrl(), x.getCode()));
+          //  x.setUrl(videoService.getVideoUrl(x.getName(), x.getPresetPosition(), x.getUrl(), x.getCode()));
         });
         return pages;
     }
@@ -1538,6 +1538,15 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         return collect.get(0).getChildren();
     }
 
+    public List<BuildingTreeVo> getBuildingTreeInMyOrgCodeList(String bizOrgCode) {
+        //如果传递的为部门bizOrgCode 取其上级单位下的建筑
+        ResponseModel<OrgUsrDto> companyByBizOrgCodeList = jcsFeign.getCompanyByBizOrgCodeList(bizOrgCode);
+        String companyCode = companyByBizOrgCodeList.getResult().getBizOrgCode();
+        List<BuildingTreeVo> buildingTreeVos = this.getBuildingTreeVos(true);
+        List<BuildingTreeVo> orgBuildingTreeVos = buildingTreeVos.stream().filter(b-> b.getBizOrgCode() != null && b.getBizOrgCode().startsWith(companyCode)).collect(Collectors.toList());
+        return orgBuildingTreeVos;
+    }
+
     @Override
     public List<OrgMenuDto> companyTreeByUserAndType() {
         return jcsRemoteService.getCompanyDeptTreeWithAuth(authKey, "COMPANY");

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PointController.java

@@ -16,6 +16,7 @@ import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
 import com.yeejoin.amos.patrol.business.service.impl.PointServiceImpl;
 import com.yeejoin.amos.patrol.business.vo.*;
 import com.yeejoin.amos.patrol.dao.entity.*;
+import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -851,13 +852,14 @@ public class PointController extends AbstractBaseController {
 		ReginParams reginParams = getSelectedOrgInfo();
 		String loginOrgCode = getOrgCode(reginParams);
 		String fileName = "巡检点导入模板.xls"; //模板名称
-		String[] handers = {"点编号","点名称","是否为移动点","计划外巡检是否评分","是否允许离线巡检","参考地址","最少拍照数量","最多拍照数量","风险等级","备注说明","检查项目","是否室内"}; //列标题
+		String[] handers = {"点编号","点名称","是否为移动点","计划外巡检是否评分","是否允许离线巡检","参考地址","最少拍照数量","最多拍照数量","风险等级","备注说明","检查项目","是否室内","归属单位/部门","责任人","所在建筑"}; //列标题
 		List<String[]> downData = new ArrayList();
 		String[] isScore = {"否","是"};
 		String[] isFixed = {"否","是"};
 		String[] offline = {"否","是"};
 		String[] isIndoor = {"否","是"};
 		String[] level = {"一级","二级","三级","四级","五级"};
+
 		//    String[] catalog = catalogTreeService.getCataLogList(loginOrgCode);
 		downData.add(isFixed);
 		downData.add(isScore);
@@ -865,7 +867,47 @@ public class PointController extends AbstractBaseController {
 		downData.add(level);
 		//    downData.add(catalog);
 		downData.add(isIndoor);
-		String [] downRows = {"2","3","4", "8","11"}; //下拉的列序号数组(序号从0开始)
+
+		//归属单位
+		ResponseModel<Object> orgUsr = jcsFeignClient.getByOrgCode(reginParams.getPersonIdentity().getBizOrgCode());
+		if (!ObjectUtils.isEmpty(orgUsr.getResult())){
+			Object result = orgUsr.getResult();
+			List<Map<String,String>> orgList =(List<Map<String,String>>)result;
+			String[] orgUsrs = new String[orgList.size()];
+			if (CollectionUtils.isNotEmpty(orgList)){
+				for (int i = 0; i < orgList.size(); i++) {
+					orgUsrs[i] = orgList.get(i).get("bizOrgName")+"@"+orgList.get(i).get("sequenceNbr");
+				}
+			}
+			downData.add(orgUsrs);
+		}else {
+			downData.add(new String[0]);
+		}
+		//责任人
+		Object o = jcsFeignClient.listCompany(reginParams.getPersonIdentity().getBizOrgCode());
+		List<Map<String,String>> personlist = (List<Map<String,String>>)o;
+		String[] person = new String[personlist.size()];
+		if (CollectionUtils.isNotEmpty(personlist)){
+			for (int i = 0; i < personlist.size(); i++) {
+				person[i] = personlist.get(i).get("bizOrgName")+"@"+personlist.get(i).get("sequenceNbr")+"@"+personlist.get(i).get("parentName");
+			}
+			downData.add(person);
+		}else {
+			downData.add(new String[0]);
+		}
+
+		//所在建筑
+		FeignClientResult result = equipFeign.myTreeList();
+		Object obj = result.getResult();
+		List<Map<String,Object>> treeMap = (List<Map<String,Object>>)obj;
+		String[] build = new String[treeMap.size()];
+		if (CollectionUtils.isNotEmpty(treeMap)){
+			for (int i = 0; i < treeMap.size(); i++) {
+				build[i] = treeMap.get(i).get("instanceName")+"@"+treeMap.get(i).get("instanceId");
+			}
+		}
+		downData.add(build);
+		String [] downRows = {"2","3","4", "8","11","12","13","14"}; //下拉的列序号数组(序号从0开始)
 
 		try {
 			FileHelper.createExcelTemplate(fileName, handers, downData, downRows, response);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/InputItemMapper.java

@@ -26,6 +26,8 @@ public interface InputItemMapper extends BaseMapper {
 
     Map<String,String> getEquipParentCode(String code);
 
+    Map<String,String> getSystemParentCode(String id);
+
     Map<String,String> getEquipParent(String parentId);
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/feign/EquipFeign.java

@@ -20,6 +20,10 @@ public interface EquipFeign {
     @RequestMapping(value = "${equip.fegin.prefix}"+"/equipSpecific/getSourceNameList", method = RequestMethod.POST ,consumes="application/json")
     LinkedHashMap<String,Object> getEquipList(@RequestBody Long id);
 
+    @RequestMapping(value = "${equip.fegin.prefix}"+"/building/myTreeList", method = RequestMethod.GET ,consumes="application/json")
+    FeignClientResult myTreeList();
+
+
     @RequestMapping(value = "${equip.fegin.prefix}"+"/warehouse-structure/listAll", method = RequestMethod.GET ,consumes="application/json")
     String getStructureNameAll();
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/feign/JcsFeignClient.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.patrol.business.feign;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
@@ -73,5 +74,8 @@ public interface JcsFeignClient {
 
     @PostMapping (value = "/org-usr/getDetByCompanyId")
     FeignClientResult<List<Map<String, Object>>> getDetByCompanyId();
+
+    @GetMapping(value = "/org-person/listCompany/{bizOrgCode}")
+     Object listCompany(@PathVariable String bizOrgCode) ;
 }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/InputItemServiceImpl.java

@@ -256,6 +256,9 @@ public class InputItemServiceImpl implements IInputItemService {
 
 	public List<String> getEquipParent(String code,List<String> objects){
 		Map<String, String> equipmentType = inputItemMapper.getEquipParentCode(code);
+		if (equipmentType == null) {
+			equipmentType =	inputItemMapper.getSystemParentCode(code);
+		}
 		if (!equipmentType.containsKey("parent_id") ){
 			objects.add(code);
 			return objects;

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_input_item.xml

@@ -331,6 +331,10 @@
 	select * from  wl_equipment_category where code = #{code} and industry_code = '2'
 </select>
 
+	<select id="getSystemParentCode" resultType="map">
+		select * from  wl_equipment_category where id=#{id} and industry_code = '2'
+	</select>
+
 	<select id="getEquipParent" resultType="map">
 		select * from  wl_equipment_category where id = #{parentId}
 	</select>