sczx_group/sczx_sync
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
eric
2025-09-25 17:19:59 +08:00
parent 5816bd6360
commit 6d868b48fe
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sczx/sync/service/impl/ReceiveServiceImpl.java
View File

@ -302,8 +302,6 @@ public class ReceiveServiceImpl implements ReceiveService {
if (companyInfoMapper.selectByOpId(companyInfo.getOperator_id()) != null) { if (companyInfoMapper.selectByOpId(companyInfo.getOperator_id()) != null) {
companyInfoMapper.updateByOpId(companyInfo); companyInfoMapper.updateByOpId(companyInfo);
} else if (companyInfoMapper.selectByCompanyName(companyInfo.getCompany_name()) != null) {
companyInfoMapper.updateByCompanyName(companyInfo);
} else { } else {
companyInfoMapper.insertCompanyInfo(companyInfo); companyInfoMapper.insertCompanyInfo(companyInfo);
} }

23
src/main/resources/mapper/CompanyInfoMapper.xml
View File

@ -25,7 +25,7 @@
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
FROM zc_company FROM zc_company
WHERE phone = #{phone} WHERE phone = #{phone}
AND is_delete = 0 AND del_flag = 0
</select> </select>
<select id="selectByCompanyName" parameterType="java.lang.String" resultMap="BaseResultMap"> <select id="selectByCompanyName" parameterType="java.lang.String" resultMap="BaseResultMap">
@ -33,7 +33,7 @@
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
FROM zc_company FROM zc_company
WHERE company_name = #{company_name} WHERE company_name = #{company_name}
AND is_delete = 0 AND del_flag = 0
</select> </select>
<select id="selectById" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="selectById" parameterType="java.lang.Long" resultMap="BaseResultMap">
@ -49,7 +49,7 @@
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
FROM zc_company FROM zc_company
WHERE b_op_id = #{bOpId} WHERE b_op_id = #{bOpId}
AND is_delete = 0 AND del_flag = 0
</select> </select>
<!-- 根据公司名称查询公司信息 --> <!-- 根据公司名称查询公司信息 -->
@ -58,7 +58,7 @@
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
FROM zc_company FROM zc_company
WHERE company_name = #{company_name} WHERE company_name = #{company_name}
AND is_delete = 0 AND del_flag = 0
</select> </select>
<!-- 根据电话号码更新公司信息 --> <!-- 根据电话号码更新公司信息 -->
@ -84,7 +84,10 @@
citys = #{citys}, citys = #{citys},
</if> </if>
<if test="isDelete != null"> <if test="isDelete != null">
is_delete = #{isDelete}, del_flag = #{is_delete},
</if>
<if test="is_delete != null">
is_delete = #{is_delete},
</if> </if>
<if test="bOpId != null"> <if test="bOpId != null">
b_op_id = #{operator_id}, b_op_id = #{operator_id},
@ -116,7 +119,10 @@
citys = #{citys}, citys = #{citys},
</if> </if>
<if test="isDelete != null"> <if test="isDelete != null">
is_delete = #{isDelete}, del_flag = #{is_delete},
</if>
<if test="is_delete != null">
is_delete = #{is_delete},
</if> </if>
<if test="bOpId != null"> <if test="bOpId != null">
b_op_id = #{operator_id}, b_op_id = #{operator_id},
@ -149,6 +155,9 @@
<if test="citys != null and citys != ''"> <if test="citys != null and citys != ''">
citys = #{citys}, citys = #{citys},
</if> </if>
<if test="is_delete != null">
del_flag = #{is_delete},
</if>
<if test="is_delete != null"> <if test="is_delete != null">
is_delete = #{is_delete}, is_delete = #{is_delete},
</if> </if>
@ -170,6 +179,7 @@
address, address,
citys, citys,
is_delete, is_delete,
del_flag,
is_add_rules, is_add_rules,
sharing_ratio, sharing_ratio,
wechat_receiving_account, wechat_receiving_account,
@ -184,6 +194,7 @@
#{address}, #{address},
#{citys}, #{citys},
#{is_delete}, #{is_delete},
#{is_delete},
0,0,0,0,0,0 0,0,0,0,0,0
) )
</insert> </insert>