Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git

xufenglei

2018-01-05 930adc902c0d0a81b685e7d3f0443df50cb608a0

Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git

 src/main/java/com/moral/entity/Area.java

@@ -1,6 +1,9 @@
package com.moral.entity;

import tk.mybatis.mapper.annotation.ColumnType;

public class Area {

    private Integer areaCode;

    private String areaName;

 src/main/java/com/moral/entity/Organization.java

@@ -4,6 +4,7 @@
import java.util.Map;



import javax.persistence.Id;

import javax.persistence.Transient;



import lombok.Data;



@@ -88,4 +89,7 @@
     */

    private String description;



    @Transient

    private AreaNames areaNames;



}

 src/main/java/com/moral/entity/exp/OrganizationExp.java

File was deleted

 src/main/java/com/moral/mapper/OrganizationMapper.java

@@ -5,10 +5,9 @@


import com.moral.common.mapper.BaseMapper;

import com.moral.entity.Organization;

import com.moral.entity.exp.OrganizationExp;

import tk.mybatis.mapper.entity.Example;



public interface OrganizationMapper extends BaseMapper<Organization> {

    List<OrganizationExp> selectWithAreaNameByExample(Example example);

    List<Organization> selectWithAreaNameByExample(Example example);

    List<Organization> getOrganizationsByAreaName(Map<String, Object> parameters);

}

 src/main/java/com/moral/service/impl/OrganizationServiceImpl.java

@@ -6,7 +6,6 @@
import com.moral.common.util.ExampleUtil;

import com.moral.common.util.ValidateUtil;

import com.moral.entity.Organization;

import com.moral.entity.exp.OrganizationExp;

import com.moral.entity.OrganizationRelation;

import com.moral.mapper.OrganizationMapper;

import com.moral.mapper.OrganizationRelationMapper;

@@ -61,20 +60,20 @@
        List<Example.Criteria> criteriaList = example.getOredCriteria();

        if(criteriaList!=null&&criteriaList.size()>0){

            for(Example.Criteria cri : criteriaList){

                cri.andNotEqualTo("isDelete","1");

                cri.andNotEqualTo("isDelete",Constants.IS_DELETE_TRUE);

            }

        }else {

            example.or().andNotEqualTo("isDelete","1");

            example.or().andNotEqualTo("isDelete",Constants.IS_DELETE_TRUE);

        }

        PageHelper.startPage(pageBean.getPageIndex(),pageBean.getPageSize());

        List<OrganizationExp> organizationExpandList = organizationMapper.selectWithAreaNameByExample(example);

        return new PageBean(organizationExpandList);

        List<Organization> organizationList = organizationMapper.selectWithAreaNameByExample(example);

        return new PageBean(organizationList);

    }

    public void addOrModify(Organization organization){

        try{

            if(organization.getId()==null){

                //新建数据，默认为未删除状态

                organization.setIsDelete("0");

                organization.setIsDelete(Constants.IS_DELETE_FALSE);

                organizationMapper.insertSelective(organization);

            }else{

                organizationMapper.updateByPrimaryKeySelective(organization);

@@ -88,7 +87,7 @@
    @Override

    public void deleteByIds(Integer... ids) {

        Organization organization = new Organization();

        organization.setIsDelete("1");

        organization.setIsDelete(Constants.IS_DELETE_TRUE);

        if(ids!=null&&ids.length>0){

            if(ids.length==1){

                organization.setId(ids[0]);


 src/main/resources/mapper/OrganizationMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.moral.mapper.OrganizationMapper">
  <resultMap id="BaseResultMap" type="com.moral.entity.exp.OrganizationExp">
  <resultMap id="BaseResultMap" type="com.moral.entity.Organization">
    <id column="id" jdbcType="INTEGER" property="id" />
    <result column="name" jdbcType="VARCHAR" property="name" />
    <result column="rank" jdbcType="INTEGER" property="rank" />