Merge remote-tracking branch 'origin/zzm1' into zzm1

crm/src/main/java/com/kakarote/crm/mapper/xml/CrmSbzjjgMapper.xml

@@ -218,7 +218,7 @@
     </select>
 
     <select id="rankByPointerTypeDetail" resultType="String">
-        SELECT DISTINCT b.nsrmc FROM wk_crm_zjzbdm a
+        SELECT DISTINCT b.nsrsbh 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 != '检查通过'

crm/src/main/java/com/kakarote/crm/service/impl/CrmSbzjjgServiceImpl.java

@@ -31,6 +31,9 @@ public class CrmSbzjjgServiceImpl extends BaseServiceImpl<CrmSbzjjgMapper, CrmSb
     @Autowired
     private CrmSbzjjgMapper crmSbzjjgMapper;
 
+    @Autowired
+    private CrmQyjbxxMapper crmQyjbxxMapper;
+
     @Autowired
     private CrmSwjgMapper crmSwjgMapper;
 
@@ -267,24 +270,33 @@ public class CrmSbzjjgServiceImpl extends BaseServiceImpl<CrmSbzjjgMapper, CrmSb
 
         List<Map<String, Object>> mapList = new ArrayList<>();
 
-        for (String qymc : pageList) {
+        for (String nsrsbh : pageList) {
 
             CrmSbzjjg one = new LambdaQueryChainWrapper<>(crmSbzjjgMapper)
-                    .eq(CrmSbzjjg::getNsrmc, qymc)
+                    .eq(CrmSbzjjg::getNsrsbh, nsrsbh)
                     .last("limit 1")
                     .one();
 
-            CrmQyjbxx crmQyjbxx = nsrdjxxService.getNsrdjxx(one.getNsrsbh(), one.getZgswjgkfjDm());
+            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);
+            }
 
             Map<String, Object> map = new HashMap<>();
-            map.put("qymc", qymc);
+            map.put("qymc", one.getNsrmc());
             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","");
             }