bonus
/
Zlpt-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: bonus:4eab7c20f24053d9b8f064d6b35f01fdc26557e4
Branches Tags
bonus:dev
bonus:master
..
compare: bonus:be6ce9ea0651df1dbd6d4e9388679cc9daaf0453
Branches Tags
bonus:dev
bonus:master

No commits in common. "4eab7c20f24053d9b8f064d6b35f01fdc26557e4" and "be6ce9ea0651df1dbd6d4e9388679cc9daaf0453" have entirely different histories.
4eab7c20f2 ... be6ce9ea06

5 changed files with 8 additions and 42 deletions
Show Stats Expand all files Collapse all files

8
zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCompanyInfo.java
View File

@ -58,14 +58,6 @@ public class BmCompanyInfo implements Serializable {
@ApiModelProperty(value = "统一社会信用代码", required = true)
private String creditCode;
@Excel(name = "注册地址")
@ApiModelProperty(value = "注册地址", required = true)
private String registerId;
@Excel(name = "经营地址")
@ApiModelProperty(value = "经营地址", required = true)
private String operateId;
/**
* 注册地址
*/

4
zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/vo/BmCompanyVo.java
View File

@ -5,8 +5,6 @@ import com.bonus.zlpt.company.api.domain.BmCoBank;
import com.bonus.zlpt.company.api.domain.BmCompanyInfo;
import lombok.Data;
import java.util.List;
@Data
public class BmCompanyVo {
@ -14,7 +12,7 @@ public class BmCompanyVo {
private BmCompanyInfo bmCompanyInfo;
//企业开户行信息
private List<BmCoBank> bmCoBank;
private BmCoBank bmCoBank;
}

4
zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/mapper/BmCoBankMapper.java
View File

@ -3,8 +3,6 @@ package com.bonus.zlpt.company.mapper;
import com.bonus.zlpt.company.api.domain.BmCoBank;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* Description:
* @Author 阮世耀
@ -61,5 +59,5 @@ public interface BmCoBankMapper {
* @param companyId
* @return
*/
List<BmCoBank> selectByCompanyId(Integer companyId);
BmCoBank selectByCompanyId(Integer companyId);
}

2
zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java
View File

@ -91,7 +91,7 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
List<BmCompanyInfo> bmCompanyInfos = bmCompanyInfoMapper.selectList(bmCompanyDto);
for (BmCompanyInfo bmCompanyInfo : bmCompanyInfos) {
SysUser data = remoteUserService.selectUserById(bmCompanyInfo.getCreator().longValue()).getData();
SysUser data = remoteUserService.selectUserById(bmCompanyInfo.getAuditor().longValue()).getData();
bmCompanyInfo.setUserName(data.getUserName());
}
return bmCompanyInfos;

32
zlpt-modules/zlpt-company/src/main/resources/mapper/BmCompanyInfoMapper.xml
View File

@ -9,8 +9,6 @@
<result column="company_type" jdbcType="VARCHAR" property="companyType" />
<result column="company_ltd" jdbcType="VARCHAR" property="companyLtd" />
<result column="credit_code" jdbcType="VARCHAR" property="creditCode" />
<result column="register_id" jdbcType="VARCHAR" property="registerId" />
<result column="operate_id" jdbcType="VARCHAR" property="operateId" />
<result column="register_address" jdbcType="VARCHAR" property="registerAddress" />
<result column="operate_address" jdbcType="VARCHAR" property="operateAddress" />
<result column="certificateType" jdbcType="VARCHAR" property="certificatetype" />
@ -41,7 +39,7 @@
<sql id="Base_Column_List">
<!--@mbg.generated-->
company_id, company_name, company_type, company_ltd, credit_code,register_id,operate_id, register_address,
company_id, company_name, company_type, company_ltd, credit_code, register_address,
operate_address, certificateType, id_number, business_license, legal_person, invitation_code,
invitation_co_name, business_scope, auth_person, auth_id_number, auth_phone, auth_document,
id_face_url, id_nation_url, auth_email,create_time, creator, auditor, audit_time, audit_remark,
@ -63,7 +61,7 @@
<insert id="insert" keyColumn="company_id" keyProperty="companyId" parameterType="com.bonus.zlpt.company.api.domain.BmCompanyInfo" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into bm_company_info (company_name, company_type, company_ltd,
credit_code,register_id,operate_id, register_address, operate_address,
credit_code, register_address, operate_address,
certificateType, id_number, business_license,
legal_person, invitation_code, invitation_co_name,
business_scope, auth_person, auth_id_number,
@ -72,7 +70,7 @@
auditor, audit_time, audit_remark,
`status`,logo_url update_time,legal_face_url,legal_nation_url)
values (#{companyName,jdbcType=VARCHAR}, #{companyType,jdbcType=VARCHAR}, #{companyLtd,jdbcType=VARCHAR},
#{creditCode,jdbcType=VARCHAR},#{registerId,jdbcType=VARCHAR},#{operateId,jdbcType=VARCHAR}, #{registerAddress,jdbcType=VARCHAR}, #{operateAddress,jdbcType=VARCHAR},
#{creditCode,jdbcType=VARCHAR}, #{registerAddress,jdbcType=VARCHAR}, #{operateAddress,jdbcType=VARCHAR},
#{certificatetype,jdbcType=VARCHAR}, #{idNumber,jdbcType=VARCHAR}, #{businessLicense,jdbcType=VARCHAR},
#{legalPerson,jdbcType=VARCHAR}, #{invitationCode,jdbcType=VARCHAR}, #{invitationCoName,jdbcType=VARCHAR},
#{businessScope,jdbcType=VARCHAR}, #{authPerson,jdbcType=VARCHAR}, #{authIdNumber,jdbcType=VARCHAR},
@ -98,12 +96,6 @@
<if test="creditCode != null and creditCode != ''">
credit_code,
</if>
<if test="registerId != null and registerId != ''">
register_id,
</if>
<if test="operateId != null and operateId != ''">
operate_id,
</if>
<if test="registerAddress != null and registerAddress != ''">
register_address,
</if>
@ -196,12 +188,6 @@
<if test="creditCode != null and creditCode != ''">
#{creditCode,jdbcType=VARCHAR},
</if>
<if test="registerId != null and registerId != ''">
#{registerId,jdbcType=VARCHAR},
</if>
<if test="operateId != null and operateId != ''">
#{operateId,jdbcType=VARCHAR},
</if>
<if test="registerAddress != null and registerAddress != ''">
#{registerAddress,jdbcType=VARCHAR},
</if>
@ -299,12 +285,6 @@
<if test="creditCode != null and creditCode != ''">
credit_code = #{creditCode,jdbcType=VARCHAR},
</if>
<if test="registerId != null and registerId != ''">
register_id = #{registerId,jdbcType=VARCHAR},
</if>
<if test="operateId != null and operateId != ''">
operate_id = #{operateId,jdbcType=VARCHAR},
</if>
<if test="registerAddress != null and registerAddress != ''">
register_address = #{registerAddress,jdbcType=VARCHAR},
</if>
@ -394,8 +374,6 @@
company_type = #{companyType,jdbcType=VARCHAR},
company_ltd = #{companyLtd,jdbcType=VARCHAR},
credit_code = #{creditCode,jdbcType=VARCHAR},
register_id = #{registerId,jdbcType=VARCHAR},
operate_id = #{operateId,jdbcType=VARCHAR},
register_address = #{registerAddress,jdbcType=VARCHAR},
operate_address = #{operateAddress,jdbcType=VARCHAR},
certificateType = #{certificatetype,jdbcType=VARCHAR},
@ -439,7 +417,7 @@
</select>
<select id="selectCountByCompanyType" resultType="java.lang.Integer">
select count(*) from bm_company_info
select count(*) form bm_company_info
<where>
status = '1'
<if test="companyName!= null and companyName!= ''">
@ -461,7 +439,7 @@
and date_format( #{endTime}, '%Y-%m-%d' )
</if>
<if test="userName != null and userName != ''">
and creator in (select user_id from sys_user where user_name LIKE CONCAT('%', #{userName}, '%'))
and auditor in (select user_id from sys_user where user_name LIKE CONCAT('%', #{userName}, '%'))
</if>
</where>
</select>