This commit is contained in:
linfso 2024-06-15 08:24:55 +08:00
parent 4e47e2c5bc
commit 189d9f14e4
5 changed files with 40 additions and 1 deletions

View File

@ -17,6 +17,7 @@ import javax.servlet.http.HttpServletResponse;
import com.xdadan.erp.common.utils.DateUtils; import com.xdadan.erp.common.utils.DateUtils;
import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.service.EmisBaseService;
import com.xdadan.erp.emis.utils.WaybillHelper; import com.xdadan.erp.emis.utils.WaybillHelper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DuplicateKeyException; import org.springframework.dao.DuplicateKeyException;
@ -54,6 +55,9 @@ public class EmisSiteAccountController extends EmisBaseController
@Autowired @Autowired
private IEmisSiteAccountService emisSiteAccountService; private IEmisSiteAccountService emisSiteAccountService;
@Autowired
private EmisBaseService emisBaseService;
/** /**
* 查询网点结算账户列表 * 查询网点结算账户列表
*/ */
@ -100,6 +104,14 @@ public class EmisSiteAccountController extends EmisBaseController
return toAjax(emisSiteAccountService.insertEmisSiteAccount(emisSiteAccount)); return toAjax(emisSiteAccountService.insertEmisSiteAccount(emisSiteAccount));
} }
/**
* 获取已开户网点
*/
@GetMapping(value = "/getHasAddSite")
public AjaxResult getHasAddSite()
{
return AjaxResult.success(emisBaseService.getHasAddSite());
}
/** /**
* 批量开户 * 批量开户

View File

@ -67,4 +67,11 @@ public interface EmisSiteAccountMapper extends BaseMapper<EmisSiteAccount>
* @return 结果 * @return 结果
*/ */
public int deleteEmisSiteAccountByIds(Long[] ids); public int deleteEmisSiteAccountByIds(Long[] ids);
/**
* 获取已开户网点表
* @return
*/
public String getHasAddSite();
} }

View File

@ -122,6 +122,9 @@ public class EmisBaseService {
@Autowired @Autowired
private EmisWaybillTransferMapper emisWaybillTransferMapper; private EmisWaybillTransferMapper emisWaybillTransferMapper;
@Autowired
private EmisSiteAccountMapper emisSiteAccountMapper;
/** /**
* 获取客户完整手机号 国家+电话 eg: 0086-1381861188 * 获取客户完整手机号 国家+电话 eg: 0086-1381861188
@ -174,6 +177,14 @@ public class EmisBaseService {
return emisWaybillMapper.selectWaybillStatByEmpCode(empNo,null); return emisWaybillMapper.selectWaybillStatByEmpCode(empNo,null);
} }
/**
* 获取已经开户网点列表
* @return
*/
public String getHasAddSite(){
return emisSiteAccountMapper.getHasAddSite();
}
/** /**
* 获取员工提成信息 * 获取员工提成信息
* @param empNo * @param empNo

View File

@ -11,6 +11,8 @@
package com.xdadan.erp.emis.service.impl; package com.xdadan.erp.emis.service.impl;
import java.util.List; import java.util.List;
import com.xdadan.erp.emis.service.EmisBaseService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.xdadan.erp.emis.domain.EmisSiteAccount; import com.xdadan.erp.emis.domain.EmisSiteAccount;
@ -24,7 +26,7 @@ import com.xdadan.erp.emis.service.IEmisSiteAccountService;
* @date 2024-03-07 10:48:12 * @date 2024-03-07 10:48:12
*/ */
@Service @Service
public class EmisSiteAccountServiceImpl implements IEmisSiteAccountService public class EmisSiteAccountServiceImpl extends EmisBaseService implements IEmisSiteAccountService
{ {
@Autowired @Autowired
private EmisSiteAccountMapper emisSiteAccountMapper; private EmisSiteAccountMapper emisSiteAccountMapper;

View File

@ -101,6 +101,13 @@
where a.id = #{id} where a.id = #{id}
</select> </select>
<select id="getHasAddSite" resultType="String">
select GROUP_CONCAT(distinct site_code) as site_code
from emis_site_account a
where del_flag='0'
</select>
<insert id="insertEmisSiteAccount" parameterType="EmisSiteAccount" useGeneratedKeys="true" keyProperty="id"> <insert id="insertEmisSiteAccount" parameterType="EmisSiteAccount" useGeneratedKeys="true" keyProperty="id">
insert into emis_site_account insert into emis_site_account
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">