Commit 84ce6767 authored by huyuchen's avatar huyuchen

缴费库 代码修改

parent d556b8a5
...@@ -36,12 +36,12 @@ import java.util.List; ...@@ -36,12 +36,12 @@ import java.util.List;
public interface TSettleDomainMapper extends BaseMapper<TSettleDomain> { public interface TSettleDomainMapper extends BaseMapper<TSettleDomain> {
/** /**
* @param id * @param departNo
* @Author: wangan * @Author: wangan
* @Date: 2019/10/18 * @Date: 2019/10/18
* @Description: 通过id获取项目及单位部分信息 * @Description: 通过id获取项目及单位部分信息
**/ **/
TSettleDomainSelectVo selectSettleDomainSelectVosById(@Param("id") String id); TSettleDomainSelectVo selectSettleDomainSelectVosById(@Param("departNo") String departNo);
/** /**
* 获取所有客户单位的项目信息 * 获取所有客户单位的项目信息
......
...@@ -95,7 +95,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T ...@@ -95,7 +95,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
**/ **/
@Override @Override
public TSettleDomainSelectVo selectSettleDomainSelectVosById(TSettleDomainSelectVo settleDomainSelectVo) { public TSettleDomainSelectVo selectSettleDomainSelectVosById(TSettleDomainSelectVo settleDomainSelectVo) {
return baseMapper.selectSettleDomainSelectVosById(settleDomainSelectVo.getId()); return baseMapper.selectSettleDomainSelectVosById(settleDomainSelectVo.getDepartNo());
} }
@Override @Override
......
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
INDUSTRY_BELONG, INDUSTRY_BELONG,
CUSTOMER_CODE from t_customer_info CUSTOMER_CODE from t_customer_info
) c ON a.CUSTOMER_ID = c.customerId ) c ON a.CUSTOMER_ID = c.customerId
WHERE a.id=#{id} GROUP BY a.id WHERE a.DEPART_NO=#{departNo} GROUP BY a.DEPART_NO
</select> </select>
<select id="selectAllSettleDomainSelectVos" resultMap="tSettleDomainSelectVoMap"> <select id="selectAllSettleDomainSelectVos" resultMap="tSettleDomainSelectVoMap">
......
...@@ -88,6 +88,7 @@ public class TAgentConfigServiceImpl extends ServiceImpl<TAgentConfigMapper, TAg ...@@ -88,6 +88,7 @@ public class TAgentConfigServiceImpl extends ServiceImpl<TAgentConfigMapper, TAg
if (Common.isNotNull(count)) { if (Common.isNotNull(count)) {
return R.failed("同一城市,年度的政策不能重复新增"); return R.failed("同一城市,年度的政策不能重复新增");
} }
baseMapper.insert(tAgentConfig);
return R.ok(); return R.ok();
} }
} }
...@@ -1825,6 +1825,33 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -1825,6 +1825,33 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
} }
} }
/**
* map数据封装
*
* @param settleDomainList
* @param settleDomainNameMap
* @param customerNameMap
* @param settleIdAndCustomerIdMap
* @return
* @Author huyc
* @Date 2022-07-18
**/
private void initSettleDomainMaps(List<TSettleDomainSelectVo> settleDomainList,
Map<String, String> settleDomainNameMap,
Map<String, String> customerNameMap,
Map<String, String> settleIdAndCustomerIdMap) {
//map数据封装
if (Common.isNotNull(settleDomainList)) {
for (TSettleDomainSelectVo settleDomainSelectVo : settleDomainList) {
settleDomainNameMap.put(settleDomainSelectVo.getId(), settleDomainSelectVo.getDepartName());
settleIdAndCustomerIdMap.put(settleDomainSelectVo.getId(), settleDomainSelectVo.getCustomerId());
if (!customerNameMap.containsKey(settleDomainSelectVo.getCustomerName())) {
customerNameMap.put(settleDomainSelectVo.getCustomerId(), settleDomainSelectVo.getCustomerName());
}
}
}
}
/** /**
* 初始化社保公积金基数 * 初始化社保公积金基数
* *
...@@ -1858,33 +1885,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -1858,33 +1885,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
initBaseSetMap(baseSocialTimeMap, baseFundTimeMap, baseSocialSetMap, baseFundSetMap); initBaseSetMap(baseSocialTimeMap, baseFundTimeMap, baseSocialSetMap, baseFundSetMap);
} }
/**
* map数据封装
*
* @param settleDomainList
* @param settleDomainNameMap
* @param customerNameMap
* @param settleIdAndCustomerIdMap
* @return
* @Author huyc
* @Date 2022-07-18
**/
private void initSettleDomainMaps(List<TSettleDomainSelectVo> settleDomainList,
Map<String, String> settleDomainNameMap,
Map<String, String> customerNameMap,
Map<String, String> settleIdAndCustomerIdMap) {
//map数据封装
if (Common.isNotNull(settleDomainList)) {
for (TSettleDomainSelectVo settleDomainSelectVo : settleDomainList) {
settleDomainNameMap.put(settleDomainSelectVo.getId(), settleDomainSelectVo.getDepartName());
settleIdAndCustomerIdMap.put(settleDomainSelectVo.getId(), settleDomainSelectVo.getCustomerId());
if (!customerNameMap.containsKey(settleDomainSelectVo.getCustomerName())) {
customerNameMap.put(settleDomainSelectVo.getCustomerId(), settleDomainSelectVo.getCustomerName());
}
}
}
}
/** /**
* 初始化派减的相关状态及数据 * 初始化派减的相关状态及数据
* *
......
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