zhangwenzan
/
crm_pro-master
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zhangwenzan:d6998f2185ef9f539d0163b1d997a5e1b4e4c716
Branches Tags
zhangwenzan:main
zhangwenzan:zzm1
zhangwenzan:test
..
compare: zhangwenzan:24893626f8dd7f933355164c7778f8a20ccce113
Branches Tags
zhangwenzan:zzm1
zhangwenzan:test
zhangwenzan:main

No commits in common. "d6998f2185ef9f539d0163b1d997a5e1b4e4c716" and "24893626f8dd7f933355164c7778f8a20ccce113" have entirely different histories.
d6998f2185 ... 24893626f8

2 changed files with 7 additions and 19 deletions
Show Stats Expand all files Collapse all files

2
crm/src/main/java/com/kakarote/crm/mapper/xml/CrmSbzjjgMapper.xml
View File

@ -218,7 +218,7 @@
</select>
<select id="rankByPointerTypeDetail" resultType="String">
SELECT DISTINCT b.nsrsbh FROM wk_crm_zjzbdm a
SELECT DISTINCT b.nsrmc FROM wk_crm_zjzbdm a
INNER JOIN wk_crm_sbzjjg b ON a.zb_id = b.zb_id
WHERE a.zb_dm = #{vo.zjzb}
AND b.zjztmc != '检查通过'

24
crm/src/main/java/com/kakarote/crm/service/impl/CrmSbzjjgServiceImpl.java
View File

@ -31,9 +31,6 @@ public class CrmSbzjjgServiceImpl extends BaseServiceImpl<CrmSbzjjgMapper, CrmSb
@Autowired
private CrmSbzjjgMapper crmSbzjjgMapper;
@Autowired
private CrmQyjbxxMapper crmQyjbxxMapper;
@Autowired
private CrmSwjgMapper crmSwjgMapper;
@ -270,33 +267,24 @@ public class CrmSbzjjgServiceImpl extends BaseServiceImpl<CrmSbzjjgMapper, CrmSb
List<Map<String, Object>> mapList = new ArrayList<>();
for (String nsrsbh : pageList) {
for (String qymc : pageList) {
CrmSbzjjg one = new LambdaQueryChainWrapper<>(crmSbzjjgMapper)
.eq(CrmSbzjjg::getNsrsbh, nsrsbh)
.eq(CrmSbzjjg::getNsrmc, qymc)
.last("limit 1")
.one();
CrmQyjbxx crmQyjbxx;
crmQyjbxx = new LambdaQueryChainWrapper<>(crmQyjbxxMapper)
.eq(CrmQyjbxx::getNsrsbh, nsrsbh)
.last("limit 1")
.one();
if (crmQyjbxx == null) {
crmQyjbxx = nsrdjxxService.getNsrdjxx(one.getNsrsbh(), one.getZgswjgkfjDm());
crmQyjbxxMapper.insert(crmQyjbxx);
}
CrmQyjbxx crmQyjbxx = nsrdjxxService.getNsrdjxx(one.getNsrsbh(), one.getZgswjgkfjDm());
Map<String, Object> map = new HashMap<>();
map.put("qymc", one.getNsrmc());
map.put("qymc", qymc);
map.put("wgy", one.getSsgly());
map.put("qysh",nsrsbh);
if (crmQyjbxx != null) {
map.put("qysh",crmQyjbxx.getNsrsbh());
map.put("frxm",crmQyjbxx.getFddbrxm());
map.put("frlxdh",crmQyjbxx.getFddbryddh());
} else {
map.put("qysh","");
map.put("frxm","");
map.put("frlxdh","");
}