Merge branch 'developer' of http://36.40.66.175:5000/moa/amos-boot-biz into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/amosprojectmapper/PrivilegeCompanyMapper.java

+package com.yeejoin.amos.boot.module.jxiop.biz.amosprojectmapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.PrivilegeCompany;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+public interface PrivilegeCompanyMapper extends BaseMapper<PrivilegeCompany> {
+
+    @Select("select SEQUENCE_NBR as sequenceNbr,ORG_CODE as orgCode,COMPANY_NAME as companyName ,LEVEL as level from privilege_company where COMPANY_TYPE = 'region' and IS_DELETED = 0  ")
+   public List<PrivilegeCompany> getAreaCompany();
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/PrivilegeController.java

@@ -9,6 +9,8 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import com.yeejoin.amos.boot.module.jxiop.api.service.IPermissionService;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.PrivilegeCompany;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IPermissionServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.ObjectUtils;
@@ -54,6 +56,9 @@ public class PrivilegeController extends BaseController {
 	private UserEmpowerMapper userEmpowerMapper;
 	@Autowired
 	IPermissionService iPermissionService;
+
+	@Autowired
+	IPermissionServiceImpl permissionService;
 	
 	@Value("${yth.qg.id}")
 	private Long qgCompanyId;
@@ -249,4 +254,11 @@ public class PrivilegeController extends BaseController {
 	return 	ResponseHelper.buildResponse(iPermissionService.judgeUserIsStation());
 	}
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@GetMapping(value = "/getAreaCompany")
+	@ApiOperation(httpMethod = "GET", value = "查询所有区域公司", notes = "查询所有区域公司")
+	public ResponseModel<List<PrivilegeCompany>> getAreaCompany(String type) {
+		return 	ResponseHelper.buildResponse(permissionService.getAreaCompany(type));
+	}
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/PrivilegeCompany.java

+package com.yeejoin.amos.boot.module.jxiop.biz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName(value = "privilege_company",autoResultMap = true)
+public class PrivilegeCompany extends BaseEntity {
+    @TableField("COMPANY_NAME")
+    private String companyName;
+    @TableField("COMPANY_CODE")
+    private String companyCode;
+    @TableField("DESCRIPTION")
+    private String description;
+    @TableField("PARENT_ID")
+    private Long parentId;
+    @TableField("REGION_SEQ")
+    private String regionSeq;
+    @TableField("LEVEL")
+    private String level;
+    @TableField("EMAIL")
+    private String email;
+    @TableField("LONGITUDE")
+    private String longitude;
+    @TableField("LATITUDE")
+    private String latitude;
+    @TableField("CONTACT")
+    private String contact;
+    @TableField("LANDLINE_PHONE")
+    private String landlinePhone;
+    @TableField("ADDRESS")
+    private String address;
+    @TableField("COMPANY_ORG_CODE")
+    private Integer companyOrgCode;
+    @TableField("ORG_CODE")
+    private String orgCode;
+    @TableField("AGENCY_CODE")
+    private String agencyCode;
+    @TableField("COMPANY_TYPE")
+    private String companyType;
+    @TableField("SUPER_ORG_CODE")
+    private String superOrgCode;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/IPermissionServiceImpl.java

@@ -8,7 +8,9 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.service.IPermissionService;
+import com.yeejoin.amos.boot.module.jxiop.biz.amosprojectmapper.PrivilegeCompanyMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.amosprojectmapper.UserEmpowerMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.PrivilegeCompany;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.StdUserEmpower;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,6 +34,9 @@ public class IPermissionServiceImpl implements IPermissionService {
 	private UserEmpowerMapper userEmpowerMapper;
 
 	@Autowired
+	private PrivilegeCompanyMapper privilegeCompanyMapper;
+
+	@Autowired
 	private StationBasicMapper stationBasicMapper;
 
 	@Override
@@ -178,4 +183,30 @@ public class IPermissionServiceImpl implements IPermissionService {
 //        }
 //        return result;
 //    }
+
+
+
+	public List<PrivilegeCompany> getAreaCompany(String type){
+		List<PrivilegeCompany> areaCompany = privilegeCompanyMapper.getAreaCompany();
+
+		//outer_company 外部公司 当前特殊区域公司标记为 级别为 外部公司来区分
+		if (type.equals("outer_company")){
+			areaCompany= areaCompany.stream().filter(e -> e.getLevel().equals("outer_company")).collect(Collectors.toList());
+		}else {
+			areaCompany= areaCompany.stream().filter(e -> !e.getLevel().equals("outer_company")).collect(Collectors.toList());
+
+		}
+
+		PrivilegeCompany all = new PrivilegeCompany();
+		all.setCompanyName("全部");
+		all.setOrgCode("all");
+		all.setSequenceNbr(0L);
+		areaCompany.add(0,all);
+
+		return areaCompany;
+
+
+
+	}
+
 }