Commit 3ea592db authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12

parents ad58ceb3 91d724b9
......@@ -40,10 +40,10 @@ public class TGzOfferInfoExportDetailVo implements Serializable {
private String bizId;
@ExcelProperty("人员类别编码")
private String empType;
private String emplType;
@ExcelProperty("人员类别名称")
private String empTypeDescr;
private String emplTypeDescr;
/**
* 外签类型:A: 洼地外签/ B:属地外签
......
......@@ -36,10 +36,10 @@ public class TGzOfferInfoImportVo extends RowIndex implements Serializable {
@ExcelAttribute(name = "人员类别编码", maxLength = 2)
private String empType;
private String emplType;
@ExcelAttribute(name = "人员类别名称", maxLength = 32)
private String empTypeDescr;
private String emplTypeDescr;
/**
* 外签类型:A: 洼地外签/ B:属地外签
......
......@@ -64,7 +64,7 @@ public class GzConfig {
dataObject = (JSONObject)dataArray.get(i);
bankCd = dataObject.getString("bankCd");
cnapsId = dataObject.getString("cnapsId");
// TODO - 继续解析参数并存储
// TODO - 继续解析参数并存储 —— 根据 cnapsId 字段,选择新增还是修改
System.out.println("bankCd=" + bankCd);
System.out.println("cnapsId=" + cnapsId);
}
......
......@@ -433,7 +433,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
*/
private void saveData() {
log.info("{}条数据,开始存储数据库!", cachedDataList.size());
importTDispatchExportLog(cachedDataList);
importGzOffer(cachedDataList);
log.info("存储数据库成功!");
}
}).sheet().doRead();
......@@ -729,7 +729,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
return YiFuSmsUtil.sendRegistBatchSms(phones, params, signNames, templeteVo.getTempleteCode());
}
private void importTDispatchExportLog(List<TGzOfferInfoImportVo> excelVOList) {
private void importGzOffer(List<TGzOfferInfoImportVo> excelVOList) {
// 个性化校验逻辑
// 执行数据插入操作 组装
TGzOfferInfoImportVo excel;
......
......@@ -149,12 +149,6 @@
<if test="tGzOfferInfo.updateTime != null">
AND a.update_time = #{tGzOfferInfo.updateTime}
</if>
<if test="tGzOfferInfo.empType != null and tGzOfferInfo.empType.trim() != ''">
AND a.emp_type = #{tGzOfferInfo.empType}
</if>
<if test="tGzOfferInfo.empTypeDescr != null and tGzOfferInfo.empTypeDescr.trim() != ''">
AND a.emp_type_descr = #{tGzOfferInfo.empTypeDescr}
</if>
<if test="tGzOfferInfo.outSginType != null and tGzOfferInfo.outSginType.trim() != ''">
AND a.out_sgin_type = #{tGzOfferInfo.outSginType}
</if>
......@@ -315,8 +309,8 @@
a.offer_send_status,
a.update_by,
a.update_time,
a.emp_type,
a.emp_type_descr,
a.empl_type,
a.empl_type_descr,
a.out_sgin_type,
a.company,
a.name,
......
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