Merge remote-tracking branch 'origin/feature-operating-report' into feature-operating-report

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CooperationOrgan.java

@@ -72,6 +72,17 @@ public class CooperationOrgan {
 	/**  */
 	private java.util.Date updateTime;
 
+	@ApiModelProperty(value = "是否全职资源",required = false)
+	private Integer fullJobResource;
+
+	public Integer getFullJobResource() {
+		return fullJobResource;
+	}
+
+	public void setFullJobResource(Integer fullJobResource) {
+		this.fullJobResource = fullJobResource;
+	}
+
 	public Integer getOrganId() {
 		return organId;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Organization.java

@@ -51,20 +51,9 @@ public class Organization {
 	@ApiModelProperty(value = "地址",required = false)
 	private String address;
 
-	@ApiModelProperty(value = "是否全职资源",required = false)
-	private Integer fullJobResource;
-
 	@ApiModelProperty(value = "子节点列表",required = false)
 	private List<Organization> organizations;
 
-	public Integer getFullJobResource() {
-		return fullJobResource;
-	}
-
-	public void setFullJobResource(Integer fullJobResource) {
-		this.fullJobResource = fullJobResource;
-	}
-
 	public String getAreaName() {
 		return areaName;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/CooperationOrganQueryInfo.java

@@ -8,6 +8,16 @@ public class CooperationOrganQueryInfo extends QueryInfo {
     
     private Boolean isEnable;
 
+    private Integer fullJobResource;
+
+	public Integer getFullJobResource() {
+		return fullJobResource;
+	}
+
+	public void setFullJobResource(Integer fullJobResource) {
+		this.fullJobResource = fullJobResource;
+	}
+
 	public String getOrganId() {
 		return organId;
 	}

mec-biz/src/main/resources/config/mybatis/CooperationOrganMapper.xml

@@ -16,6 +16,7 @@
         <result column="ownership_type_" property="ownershipType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="full_job_resource_" property="fullJobResource"/>
     </resultMap>
     
     <resultMap type="com.ym.mec.biz.dal.entity.CooperationOrgan" id="ExtCooperationOrgan" extends="CooperationOrgan">
@@ -39,14 +40,18 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.CooperationOrgan"
             useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         INSERT INTO cooperation_organ
-        (id_,name_,linkman_,job_,mobile_no_,address_,organ_id_,create_time_,update_time_,ownership_type_,is_enable_)
-        VALUES(#{id},#{name},#{linkman},#{job},#{mobileNo},#{address},#{organId},now(),now(),#{ownershipType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{isEnable})
+        (id_,name_,linkman_,job_,mobile_no_,address_,organ_id_,create_time_,update_time_,ownership_type_,is_enable_,full_job_resource_)
+        VALUES(#{id},#{name},#{linkman},#{job},#{mobileNo},#{address},#{organId},now(),now(),
+        #{ownershipType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{isEnable},#{fullJobResource})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.CooperationOrgan">
         UPDATE cooperation_organ
         <set>
+            <if test="fullJobResource != null">
+                full_job_resource_ = #{fullJobResource},
+            </if>
             <if test="address != null">
                 address_ = #{address},
             </if>
@@ -98,6 +103,9 @@
 	        <if test="isEnable != null">
 	            AND co.is_enable_ = #{isEnable}
 	        </if>
+            <if test="fullJobResource != null">
+                AND co.full_job_resource_ = #{fullJobResource}
+            </if>
         </where>
         ORDER BY co.update_time_ DESC
         <include refid="global.limit"/>
@@ -117,6 +125,9 @@
 	        <if test="isEnable != null">
 	            AND is_enable_ = #{isEnable}
 	        </if>
+            <if test="fullJobResource != null">
+                AND full_job_resource_ = #{fullJobResource}
+            </if>
         </where>
 	</select>
 

mec-biz/src/main/resources/config/mybatis/OrganizationMapper.xml

@@ -18,7 +18,6 @@
         <result column="linkman_" property="linkman"/>
         <result column="mobile_" property="mobile"/>
         <result column="address_" property="address"/>
-        <result column="full_job_resource_" property="fullJobResource"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -34,8 +33,8 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.Organization" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
-        INSERT INTO organization (id_,name_,area_id_,create_time_,update_time_,register_date_,linkman_,mobile_,address_,full_job_resource_)
-        VALUES(#{id},#{name},#{areaId},now(),now(),#{registerDate},#{linkman},#{mobile},#{address},#{fullJobResource})
+        INSERT INTO organization (id_,name_,area_id_,create_time_,update_time_,register_date_,linkman_,mobile_,address_)
+        VALUES(#{id},#{name},#{areaId},now(),now(),#{registerDate},#{linkman},#{mobile},#{address})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -45,9 +44,6 @@
             <if test="delFlag != null">
                 del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
-            <if test="fullJobResource != null">
-                full_job_resource_ = #{fullJobResource},
-            </if>
             <if test="areaId != null">
                 area_id_ = #{areaId},
             </if>
@@ -80,9 +76,6 @@
 
     <sql id="queryPageSql">
         <where>
-            <if test="fullJobResource != null">
-                and o.full_job_resource_ = #{fullJobResource}
-            </if>
             <if test="delFlag != null">
                 and o.del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -277,7 +277,7 @@ public class RoomServiceImpl implements RoomService {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
+    @Transactional(rollbackFor = Exception.class, isolation = Isolation.SERIALIZABLE)
     public void signIn(Long roomId) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         Integer userId = sysUser.getId();