Commit 5bf3327d authored by zuoyh's avatar zuoyh

股東表插入、查詢

parent d8cfcbb3
...@@ -3,10 +3,7 @@ package com.github.wxiaoqi.security.admin.entity; ...@@ -3,10 +3,7 @@ package com.github.wxiaoqi.security.admin.entity;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import javax.persistence.Column; import javax.persistence.*;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
...@@ -58,7 +55,7 @@ public class AppShareholderDetail implements Serializable { ...@@ -58,7 +55,7 @@ public class AppShareholderDetail implements Serializable {
@Column(name = "position_id") @Column(name = "position_id")
private Integer positionId; private Integer positionId;
@Transient
private String companyIdArray; private String companyIdArray;
} }
...@@ -98,8 +98,6 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper, ...@@ -98,8 +98,6 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
if (branchCompany.getData() == null) { if (branchCompany.getData() == null) {
return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "分公司不存在"); return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "分公司不存在");
} }
appShareholderDetailDTO.setCompanyId(companyId); appShareholderDetailDTO.setCompanyId(companyId);
appShareholderDetailDTO.setCompanyName(branchCompany.getData().getName()); appShareholderDetailDTO.setCompanyName(branchCompany.getData().getName());
Integer positionId = branchCompany.getData().getId().equals(1) ? HEADQUARTERS_SHAREHOLDER : BRANCH_HEADQUARTERS_SHAREHOLDER; Integer positionId = branchCompany.getData().getId().equals(1) ? HEADQUARTERS_SHAREHOLDER : BRANCH_HEADQUARTERS_SHAREHOLDER;
......
...@@ -282,7 +282,6 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A ...@@ -282,7 +282,6 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
//记录表插入 //记录表插入
appUserPositionChangeRecordBiz.addJoinJobRecord(appUserPositionTempNew, operatorId); appUserPositionChangeRecordBiz.addJoinJobRecord(appUserPositionTempNew, operatorId);
} }
} catch (BaseException ex) { } catch (BaseException ex) {
errorResultMap = new HashMap<>(1); errorResultMap = new HashMap<>(1);
errorResultMap.put("num", i); errorResultMap.put("num", i);
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</otherwise> </otherwise>
</choose> </choose>
</select> </select>
<select id="findPage" resultMap="detail"> <select id="findPage" resultType="com.github.wxiaoqi.security.admin.entity.AppShareholderDetail">
select * from ( select * from (
select max(id) as id,max(name) as `name`,max(is_quit) as `isQuit`,max(position_id) as `positionId`,phone as select max(id) as id,max(name) as `name`,max(is_quit) as `isQuit`,max(position_id) as `positionId`,phone as
...@@ -81,6 +81,5 @@ ...@@ -81,6 +81,5 @@
<result property="isQuit" column="is_quit"/> <result property="isQuit" column="is_quit"/>
<result property="updTime" column="upd_time"/> <result property="updTime" column="upd_time"/>
<result property="positionId" column="positionId"/> <result property="positionId" column="positionId"/>
<result property="companyIdArray" column="companyIdArray"/>
</resultMap> </resultMap>
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment