Skip to content

W
wangxiaolu-sfa-module-job
提交 4278e159 authored 作者: 000516's avatar 000516
浏览文件
操作

更新经销商大区、战区、客户经理，三个属性；更新终端大区、战区、大区总、战区经理、城市经理、客户经理，六个属性

上级 146b3fe2
隐藏空白字符变更
内嵌 并排
正在显示 包含 92 行增加 和 34 行删除
src/main/java/com/sfa/job/domain/feishu/entity/QinceMarketEmployee.java
浏览文件 @ 4278e159
......@@ -39,26 +39,37 @@ public class QinceMarketEmployee implements Serializable {
* 大区部门编码
*/
private String dqDeptCode;
private String dqDeptName;
/**
* 战区部门编码
*/
private String zqDeptCode;
private String zqDeptName;
/**
* 大区总工号
*/
private String dqEmpNo;
private String dqEmpName;
/**
* 战区经理工号
*/
private String zqEmpNo;
private String zqEmpName;
/**
* 城市经理工号
*/
private String csEmpNo;
private String csEmpName;
/**
* 客户经理工号
*/
private String fEmpNo;
private String fEmpName;
/**
* 创建时间
......@@ -72,13 +83,20 @@ public class QinceMarketEmployee implements Serializable {
@TableField(exist = false)
private static final long serialVersionUID = 1L;
public QinceMarketEmployee(String dealerCode, String dealerName, String dqDeptCode, String zqDeptCode, String dqEmpNo, String zqEmpNo, String csEmpNo) {
public QinceMarketEmployee(String dealerCode, String dealerName, String dqDeptCode, String dqDeptName, String zqDeptCode, String zqDeptName, String dqEmpNo, String dqEmpName, String zqEmpNo, String zqEmpName, String csEmpNo, String csEmpName, String fEmpNo, String fEmpName) {
this.dealerCode = dealerCode;
this.dealerName = dealerName;
this.dqDeptCode = dqDeptCode;
this.dqDeptName = dqDeptName;
this.zqDeptCode = zqDeptCode;
this.zqDeptName = zqDeptName;
this.dqEmpNo = dqEmpNo;
this.dqEmpName = dqEmpName;
this.zqEmpNo = zqEmpNo;
this.zqEmpName = zqEmpName;
this.csEmpNo = csEmpNo;
this.csEmpName = csEmpName;
this.fEmpNo = fEmpNo;
this.fEmpName = fEmpName;
}
}
\ No newline at end of file
src/main/java/com/sfa/job/pojo/feishu/response/QinceMarketEmployeeDto.java
浏览文件 @ 4278e159
......@@ -13,7 +13,6 @@ public class QinceMarketEmployeeDto{
*/
private Integer id;
/**
* 经销商代码
*/
......@@ -24,26 +23,37 @@ public class QinceMarketEmployeeDto{
* 大区部门编码
*/
private String dqDeptCode;
private String dqDeptName;
/**
* 战区部门编码
*/
private String zqDeptCode;
private String zqDeptName;
/**
* 大区总工号
*/
private String dqEmpNo;
private String dqEmpName;
/**
* 战区经理工号
*/
private String zqEmpNo;
private String zqEmpName;
/**
* 城市经理工号
*/
private String csEmpNo;
private String csEmpName;
/**
* 客户经理工号
*/
private String fEmpNo;
private String fEmpName;
/**
* 创建时间
......
src/main/java/com/sfa/job/service/feishu/PullSheetServiceImpl.java
浏览文件 @ 4278e159
......@@ -44,6 +44,7 @@ public class PullSheetServiceImpl implements IPullSheetService{
JSONArray jsonArray = values.getJSONArray(i);
// 经销商代码0
String dealerCode = jsonArray.getString(0);
// 经销商名称1
// 判断dqEmpNo是否为数字，不是数字不做处理，当是数字时判断是否6位，不足6位用0补齐
if (dealerCode.matches("\\d+") && dealerCode.length() < 6) {
dealerCode = String.format("%06d", Integer.parseInt(dealerCode));
......@@ -51,16 +52,30 @@ public class PullSheetServiceImpl implements IPullSheetService{
String dealerName = jsonArray.getString(1);
// 大区部门编码2
String dqDeptCode = jsonArray.getString(2);
// 大区部门名称3
String dqDeptName = jsonArray.getString(3);
// 大区总工号4
String dqEmpNo = jsonArray.getString(4);
// 大区总工姓名5
String dqEmpName = jsonArray.getString(5);
// 战区部门编码6
String zqDeptCode = jsonArray.getString(6);
// 战区部门名称7
String zqDeptName = jsonArray.getString(7);
// 战区经理工号8
String zqEmpNo = jsonArray.getString(8);
// 战区经理姓名9
String zqEmpName = jsonArray.getString(9);
// 城市经理工号10
String csEmpNo = jsonArray.getString(10);
// 城市经理姓名11
String csEmpName = jsonArray.getString(11);
// 客户经理工号12
String fEmpNo = jsonArray.getString(12);
// 客户经理姓名13
String fEmpName = jsonArray.getString(13);
QinceMarketEmployee marketDo = new QinceMarketEmployee(dealerCode,dealerName, dqDeptCode, zqDeptCode, dqEmpNo, zqEmpNo, csEmpNo);
QinceMarketEmployee marketDo = new QinceMarketEmployee(dealerCode, dealerName, dqDeptCode, dqDeptName, zqDeptCode, zqDeptName, dqEmpNo, dqEmpName, zqEmpNo, zqEmpName, csEmpNo, csEmpName, fEmpNo, fEmpName);
dos.add(marketDo);
}
qinceMarketEmployeeDao.insert(dos);
......
src/main/java/com/sfa/job/service/qince/impl/QinceDealerQueryServiceImpl.java
浏览文件 @ 4278e159
......@@ -52,27 +52,28 @@ public class QinceDealerQueryServiceImpl implements IQinceDealerQueryService {
}
// 查询部门Map<部门编码，部门名称>，人员Map<工号，姓名>
Map<String,String> deptMap = sysDeptDao.getDeptCodeAndNameMap();
Map<String,String> userMap = sysUserDao.getUserNoAndNameMap();
// Map<String,String> deptMap = sysDeptDao.getDeptCodeAndNameMap();
// Map<String,String> userMap = sysUserDao.getUserNoAndNameMap();
/**
* 2. 反写勤策中的自定义字段：大区、战区
* BM0020 北京战区改为北京特区
*/
for (QinceMarketEmployeeDto mDto : mDtos) {
try {
Map<String, Object> ext1 = new HashMap<>();
String dqtq = "BM0020".equals(mDto.getDqDeptCode()) ? "北京特区" : deptMap.get(mDto.getDqDeptCode());
// String dqtq = "BM0020".equals(mDto.getDqDeptCode()) ? "北京特区" : deptMap.get(mDto.getDqDeptCode());
ext1.put("dealer_ext_key", "大区");
ext1.put("dealer_ext_value",dqtq);
ext1.put("dealer_ext_value",mDto.getDqDeptName());
Map<String, Object> ext2 = new HashMap<>();
ext2.put("dealer_ext_key", "战区");
ext2.put("dealer_ext_value", deptMap.get(mDto.getZqDeptCode()));
ext2.put("dealer_ext_value",mDto.getZqDeptName());
Map<String, Object> params = new HashMap<>();
params.put("dealer_id", mDto.getDealerCode());
params.put("exts", Arrays.asList(ext1, ext2));
params.put("dealer_emp_code", mDto.getFEmpNo());
// params.put("dealer_manager", mDto.getFEmpName());
String url = qinCeUtils.builderUrl(QinCeUtils.MODIFY_DEALER, params);
......@@ -81,7 +82,7 @@ public class QinceDealerQueryServiceImpl implements IQinceDealerQueryService {
// 3. 反写当前经销商所负责门店信息：城市经理、战区经理、大区总监
List<QinceClienteleStoreDto> storeDtoList = qinceClienteleStoreDao.findListByDealerId(mDto.getDealerCode());
pushQinceStoreInfo(storeDtoList, dqtq, deptMap.get(mDto.getZqDeptCode()), mDto, userMap);
pushQinceStoreInfo(storeDtoList, mDto);
log.info("push qc 终端（架构/负责人）success：{}", storeDtoList.size());
} catch (RuntimeException e) {
......@@ -125,8 +126,8 @@ public class QinceDealerQueryServiceImpl implements IQinceDealerQueryService {
List<QinceMarketEmployeeDto> mDtos = qinceMarketEmployeeDao.selectByDealerCodes(groupStores.keySet());
Map<String, QinceMarketEmployeeDto> dealerMap = mDtos.stream().collect(Collectors.toMap(dto -> dto.getDealerCode(), dto -> dto));
Map<String,String> deptMap = sysDeptDao.getDeptCodeAndNameMap();
Map<String,String> userMap = sysUserDao.getUserNoAndNameMap();
// Map<String,String> deptMap = sysDeptDao.getDeptCodeAndNameMap();
// Map<String,String> userMap = sysUserDao.getUserNoAndNameMap();
for (Map.Entry<String, List<QinceClienteleStoreDto>> storesEntry : groupStores.entrySet()) {
QinceMarketEmployeeDto mDto = dealerMap.get(storesEntry.getKey());
......@@ -135,24 +136,28 @@ public class QinceDealerQueryServiceImpl implements IQinceDealerQueryService {
continue;
}
List<QinceClienteleStoreDto> stores = storesEntry.getValue();
String dqtq = "BM0020".equals(mDto.getDqDeptCode()) ? "北京特区" : deptMap.get(mDto.getDqDeptCode());
pushQinceStoreInfo(stores, dqtq, deptMap.get(mDto.getZqDeptCode()), mDto, userMap);
// String dqtq = "BM0020".equals(mDto.getDqDeptCode()) ? "北京特区" : deptMap.get(mDto.getDqDeptCode());
pushQinceStoreInfo(stores, mDto);
log.info("push qc 终端（架构/负责人）success：{}：{}", mDto.getDealerName(),stores.size());
}
}
private void pushQinceStoreInfo(List<QinceClienteleStoreDto> storeDtoList,String dqDeptName,String zqDeptName,QinceMarketEmployeeDto mDto,Map<String,String> userMap) {
private void pushQinceStoreInfo(List<QinceClienteleStoreDto> storeDtoList,QinceMarketEmployeeDto mDto) {
Map<String, Object> params = new HashMap<>();
for (QinceClienteleStoreDto storeDto : storeDtoList) {
try {
List<Map<String, String>> exts = new ArrayList<>();
exts.add(Maps.of("store_ext_key", "城市经理", "store_ext_value", Objects.isNull(mDto.getCsEmpNo()) ? "" : userMap.get(mDto.getCsEmpNo())));
exts.add(Maps.of("store_ext_key", "战区经理", "store_ext_value", Objects.isNull(mDto.getZqEmpNo()) ? "" : userMap.get(mDto.getZqEmpNo())));
exts.add(Maps.of("store_ext_key", "大区总监", "store_ext_value", Objects.isNull(mDto.getDqEmpNo()) ? "" : userMap.get(mDto.getDqEmpNo())));
exts.add(Maps.of("store_ext_key", "大区", "store_ext_value", dqDeptName));
exts.add(Maps.of("store_ext_key", "战区", "store_ext_value", zqDeptName));
exts.add(Maps.of("store_ext_key", "城市经理", "store_ext_value", Objects.isNull(mDto.getCsEmpName()) ? "" : mDto.getCsEmpName()));
exts.add(Maps.of("store_ext_key", "战区经理", "store_ext_value", Objects.isNull(mDto.getZqEmpName()) ? "" : mDto.getZqEmpName()));
exts.add(Maps.of("store_ext_key", "大区总监", "store_ext_value", Objects.isNull(mDto.getDqEmpName()) ? "" : mDto.getDqEmpName()));
exts.add(Maps.of("store_ext_key", "大区", "store_ext_value", mDto.getDqDeptName()));
exts.add(Maps.of("store_ext_key", "战区", "store_ext_value", mDto.getZqDeptName()));
exts.add(Maps.of("store_ext_key", "战区1", "store_ext_value", mDto.getZqDeptName()));
params.put("store_waiqin_id", storeDto.getQcId());
// 客户经理
params.put("store_emp_code", mDto.getFEmpNo());
// 自定义字段
params.put("exts", exts);
String url = qinCeUtils.builderUrl(QinCeUtils.MODIFY_STORE, params);
......
src/main/resources/mapper/feishu/QinceMarketEmployeeMapper.xml
浏览文件 @ 4278e159
......@@ -9,36 +9,51 @@
<result property="dealerCode" column="dealer_code" jdbcType="VARCHAR"/>
<result property="dealerName" column="dealer_name" jdbcType="VARCHAR"/>
<result property="dqDeptCode" column="dq_dept_code" jdbcType="VARCHAR"/>
<result property="dqDeptName" column="dq_dept_name" jdbcType="VARCHAR"/>
<result property="zqDeptCode" column="zq_dept_code" jdbcType="VARCHAR"/>
<result property="zqDeptName" column="zq_dept_name" jdbcType="VARCHAR"/>
<result property="dqEmpNo" column="dq_emp_no" jdbcType="VARCHAR"/>
<result property="dqEmpName" column="dq_emp_name" jdbcType="VARCHAR"/>
<result property="zqEmpNo" column="zq_emp_no" jdbcType="VARCHAR"/>
<result property="zqEmpName" column="zq_emp_name" jdbcType="VARCHAR"/>
<result property="csEmpNo" column="cs_emp_no" jdbcType="VARCHAR"/>
<result property="csEmpName" column="cs_emp_name" jdbcType="VARCHAR"/>
<result property="fEmpNo" column="f_emp_no" jdbcType="VARCHAR"/>
<result property="fEmpName" column="f_emp_name" jdbcType="VARCHAR"/>
<result property="modifyTime" column="modify_time" jdbcType="TIMESTAMP"/>
</resultMap>
<insert id="batchInsert" parameterType="java.util.List">
insert into qince_market_employee (dealer_code,dealer_name, dq_dept_code, zq_dept_code, dq_emp_no, zq_emp_no, cs_emp_no)
insert into qince_market_employee (dealer_code, dealer_name, dq_dept_code, dq_dept_name, zq_dept_code,
zq_dept_name, dq_emp_no, dq_emp_name, zq_emp_no, zq_emp_name, cs_emp_no, cs_emp_name, f_emp_no, f_emp_name)
values
<foreach collection="dos" item="item" separator=",">
(#{item.dealerCode},#{item.dealerName},#{item.dqDeptCode},#{item.zqDeptCode},#{item.dqEmpNo},#{item.zqEmpNo},#{item.csEmpNo})
(#{item.dealerCode},#{item.dealerName},#{item.dqDeptCode},#{item.dqDeptName},#{item.zqDeptCode},#{item.zqDeptName},#{item.dqEmpNo},#{item.dqEmpName},#{item.zqEmpNo},#{item.zqEmpName},#{item.csEmpNo},#{item.csEmpName},#{item.fEmpNo},#{item.fEmpName})
</foreach>
on duplicate key
update dq_dept_code = values(dq_dept_code),
dq_dept_name = values(dq_dept_name),
zq_dept_code = values(zq_dept_code),
zq_dept_name = values(zq_dept_name),
dq_emp_no = values(dq_emp_no),
dq_emp_name = values(dq_emp_name),
zq_emp_no = values(zq_emp_no),
cs_emp_no = values(cs_emp_no);
zq_emp_name = values(zq_emp_name),
cs_emp_no = values(cs_emp_no),
cs_emp_name = values(cs_emp_name),
f_emp_no = values(f_emp_no),
f_emp_name = values(f_emp_name);
</insert>
<select id="selectByTodayUpdate" resultMap="QinceMarketEmployeeResultMap">
select dealer_code, dealer_name, dq_dept_code, zq_dept_code, dq_emp_no, zq_emp_no, cs_emp_no
select dealer_code, dealer_name, dq_dept_code, dq_dept_name, zq_dept_code, zq_dept_name, dq_emp_no, dq_emp_name, zq_emp_no, zq_emp_name, cs_emp_no, cs_emp_name, f_emp_no, f_emp_name
from qince_market_employee
where date (modify_time) = date (current_date);
where date (modify_time) = date (current_date)
</select>
<select id="selectByDealerCodes" parameterType="java.util.Set" resultMap="QinceMarketEmployeeResultMap">
select dealer_code, dealer_name, dq_dept_code, zq_dept_code, dq_emp_no, zq_emp_no, cs_emp_no
select dealer_code, dealer_name, dq_dept_code, dq_dept_name, zq_dept_code, zq_dept_name, dq_emp_no, dq_emp_name, zq_emp_no, zq_emp_name, cs_emp_no, cs_emp_name, f_emp_no, f_emp_name
from qince_market_employee
where dealer_code in
<foreach collection="dealerCodes" item="item" separator="," open="(" close=")">
......
src/main/resources/mapper/qince/QinceClienteleStoreMapper.xml
浏览文件 @ 4278e159
......@@ -7,18 +7,12 @@
<select id="findListByDealerId" resultType="com.sfa.job.domain.qince.entity.QinceClienteleStore">
select qc_id, store_name, store_code
from qince_clientele_store
where dealer_id = #{dealerId}
and store_cooperate_status = '1'
and store_approval_status = 3
and store_status = '1'
where dealer_id = #{dealerId} and store_status = '1'
</select>
<select id="findListByCreateDate" resultType="com.sfa.job.domain.qince.entity.QinceClienteleStore">
select qc_id, store_name, store_code,dealer_id,dealers_name,create_time
from qince_clientele_store
where create_time like concat(#{yesterday},'%')
and store_cooperate_status = '1'
and store_approval_status = 3
and store_status = '1';
where create_time like concat(#{yesterday},'%') and store_status = '1'
</select>
</mapper>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论