Merge branch 'dev' of LiTaohong/wlyy2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/base/org/BaseOrgDO.java

@@ -143,14 +143,13 @@ public class BaseOrgDO extends UuidIdentityEntityWithOperator {
	private String del;
	public BaseOrgDO(String provinceCode,String provinceName,String cityCode,String cityName,String townCode,String townName,String streetCode,String streetName,String code,String name ){
	public BaseOrgDO(String provinceCode,String provinceName,String cityCode,String cityName,String townCode,String townName,String code,String name ){
	    this.provinceCode = provinceCode;
	    this.provinceName = provinceName;
	    this.cityCode = cityCode;
	    this.cityName = cityName;
	    this.townCode = townCode;
	    this.streetCode = streetCode;
	    this.streetName = streetName;
	    this.townName = townName;
	    this.code = code;
	    this.name = name;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/base/role/RoleDO.java

@@ -14,14 +14,14 @@ import javax.persistence.Table;
@Table(name = "base_role")
public class RoleDO extends UuidIdentityEntityWithOperator {
	/**
	 * 角色代码
	 */
	private String code;
	/**
	 * 角色名称
	 */
	private String name;
	/**
	 * 角色代码
     */
	private String code;
	/**
	 * 1.系统管理员，2.saas管理员，3.机构管理员
     */

svr/svr-base/src/main/java/com/yihu/jw/base/dao/org/BaseOrgDao.java

@@ -30,18 +30,18 @@ public interface BaseOrgDao extends PagingAndSortingRepository<BaseOrgDO, String
    @Query("select id as id,code as code,name as name,case del when 1 then '有效' else '失效' end as status,concat(provinceName,cityName,townName,streetName) as address from BaseOrgDO where code like ?1 and del = ?2")
    List<Map<String,Object>> findByCodeAndDel(String code, String del,Pageable pageable);
    @Query("select id as id,idcard as idcard,name as name,case del when 1 then '有效' else '失效' end as status,concat(provinceName,cityName,townName,streetName) as address from BaseOrgDO where name like ?1")
    @Query("select id as id,code as code,name as name,case del when 1 then '有效' else '失效' end as status,concat(provinceName,cityName,townName,streetName) as address from BaseOrgDO where name like ?1")
    List<Map<String,Object>> findByName(String name,Pageable pageable);
    @Query("select id as id,idcard as idcard,name as name,case del when 1 then '有效' else '失效' end as status,concat(provinceName,cityName,townName,streetName) as address from BaseOrgDO where name like ?1 and del = ?2")
    @Query("select id as id,code as code,name as name,case del when 1 then '有效' else '失效' end as status,concat(provinceName,cityName,townName,streetName) as address from BaseOrgDO where name like ?1 and del = ?2")
    List<Map<String,Object>> findByNameAndDel(String name, String del,Pageable pageable);
    @Query("select id as id,idcard as idcard,name as name,case del when 1 then '有效' else '失效' end as status,concat(provinceName,cityName,townName,streetName) as address from BaseOrgDO")
    @Query("select id as id,code as code,name as name,case del when 1 then '有效' else '失效' end as status,concat(provinceName,cityName,townName,streetName) as address from BaseOrgDO")
    List<Map<String,Object>> findBaseInfo(Pageable pageable);
    @Query("select id as id,idcard as idcard,name as name,case del when 1 then '有效' else '失效' end as status,concat(provinceName,cityName,townName,streetName) as address from BaseOrgDO where del = ?1")
    @Query("select id as id,code as code,name as name,case del when 1 then '有效' else '失效' end as status,concat(provinceName,cityName,townName,streetName) as address from BaseOrgDO where del = ?1")
    List<Map<String,Object>> findBaseInfoByDel(String del, Pageable pageable);
    @Query("select new BaseOrgDO(provinceCode,provinceName,cityCode,cityName,townCode,streetCode,streetName,code,name) from BaseOrgDO")
    @Query("select new BaseOrgDO(provinceCode,provinceName,cityCode,cityName,townCode,townName,code,name) from BaseOrgDO")
    List<BaseOrgDO> findOrgByArea();
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/org/BaseOrgService.java

@@ -13,6 +13,7 @@ import com.yihu.jw.entity.base.org.BaseOrgDO;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -42,6 +43,7 @@ public class BaseOrgService extends BaseJpaService<BaseOrgDO, BaseOrgDao> {
     * @return
     */
    public List<Map<String,Object>> queryOrgBaseInfoList(String orgCode,String orgName,String orgStatus,int page,int size,String sorts){
        getOrgByArea();
        List<Map<String,Object>> result = new ArrayList<>();
        if(StringUtils.endsWithIgnoreCase("1",orgStatus)){
            if(!StringUtils.isEmpty(orgCode) ){
@@ -76,39 +78,49 @@ public class BaseOrgService extends BaseJpaService<BaseOrgDO, BaseOrgDao> {
        JSONArray townArray = new JSONArray();
        JSONArray orgArray = new JSONArray();
        JSONObject proJson = new JSONObject();
        JSONObject cityJson = new JSONObject();
        JSONObject townJson = new JSONObject();
        JSONObject orgJson = new JSONObject();
        List<BaseOrgDO> list = baseOrgDao.findOrgByArea();
        list.forEach(baseOrgDO -> {
            JSONObject proJson = new JSONObject();
        for(BaseOrgDO baseOrgDO : list){
          /*  if(!proJson.containsKey(baseOrgDO.getProvinceCode())){
                provinceArray.add(proJson);
            }
            if(!cityJson.containsKey(baseOrgDO.getCityCode())){
                proJson.put("city",cityJson);
                cityArray.add(cityJson);
                cityJson.put("town", townJson);
            }
            if(!townJson.containsKey(baseOrgDO.getTownCode())){
                townArray.add(townJson);
            }
            if(!orgJson.containsKey(baseOrgDO.getCode())){
                townJson.put("org",orgJson);
                orgArray.add(orgJson);
            }*/
            proJson.put("provinceCode",baseOrgDO.getProvinceCode());
            proJson.put("provinceName",baseOrgDO.getProvinceName());
            JSONObject cityJson = new JSONObject();
            cityJson.put("provinceCode",baseOrgDO.getProvinceCode());
            cityJson.put("provinceName",baseOrgDO.getProvinceName());
            cityJson.put("cityCode",baseOrgDO.getCityCode());
            cityJson.put("cityName",baseOrgDO.getCityName());
            JSONObject townJson = new JSONObject();
            townJson.put("provinceCode",baseOrgDO.getProvinceCode());
            townJson.put("provinceName",baseOrgDO.getProvinceName());
            townJson.put("townCode",baseOrgDO.getTownCode());
            townJson.put("townName",baseOrgDO.getTownName());
            JSONObject orgJson = new JSONObject();
            orgJson.put("provinceCode",baseOrgDO.getProvinceCode());
            orgJson.put("provinceName",baseOrgDO.getProvinceName());
            orgJson.put("orgCode",baseOrgDO.getCode());
            orgJson.put("orgName",baseOrgDO.getName());
            provinceArray.add(proJson);
            cityArray.add(cityJson);
            townArray.add(townJson);
            orgArray.add(orgJson);
            JSONObject cityJsonAyy = new JSONObject();
            cityJsonAyy.put("city",cityArray);
            provinceArray.add(cityJsonAyy);
            JSONObject townJsonAyy = new JSONObject();
            townJsonAyy.put("town", townArray);
            cityArray.add(townJsonAyy);
            JSONObject orgJsonAyy = new JSONObject();
            orgJsonAyy.put("org",orgArray);
            townArray.add(orgJsonAyy);
        });
            proJson.put("city",cityJson);
            cityJson.put("town", townJson);
            townJson.put("org",orgJson);
        }
        result.put("province",provinceArray);
        return result;
    }