提交代码

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/UserEmpowerInterceptor.java

@@ -124,7 +124,13 @@ public class UserEmpowerInterceptor implements Interceptor {
                             sqldata=" 1= 2 ";
                         }
 
-                        if (ValidationUtil.isEmpty(selectBody.getWhere())) {
+                        if("com.yeejoin.amos.boot.module.hygf.api.mapper.HygfIcbcRecordMapper.pageList_COUNT".equals(mappedStatement.getId()))
+                        {
+                            PlainSelect selectSubBody= ((PlainSelect)((SubSelect)selectBody.getFromItem()).getSelectBody());
+                            AndExpression andExpr = new AndExpression(selectSubBody.getWhere(), CCJSqlParserUtil.parseCondExpression(sqldata));
+                            selectSubBody.setWhere(andExpr);
+                        }
+                        else if (ValidationUtil.isEmpty(selectBody.getWhere())) {
                             selectBody.setWhere(CCJSqlParserUtil.parseCondExpression(sqldata));
                         } else {
                             AndExpression andExpr = new AndExpression(selectBody.getWhere(), CCJSqlParserUtil.parseCondExpression(sqldata));

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/HygfIcbcRecordMapper.xml

@@ -107,7 +107,8 @@
         MAX(ph.regional_companies_name) AS regionalCompaniesName,
         MAX(ph.regional_companies_code) AS regionalCompaniesCode,
         MAX(wr.paymentAmount) AS paymentAmount,
-        MAX(wr.payment_time) AS paymentTime
+        MAX(wr.payment_time) AS paymentTime,
+        MAX(icbc.type) AS type
         FROM
         (
         SELECT

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/HygfIcbcServiceImpl.java

@@ -707,6 +707,7 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
                 futures.add(fan);
             }
         }
+
         CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).get();
         if (CollectionUtil.isNotEmpty(hygfIcbcRecordExportDTOS)) {
             ExcelUtil.createTemplate(response, "账号信息", "账号信息", hygfIcbcRecordExportDTOS, HygfIcbcRecordExportDTO.class, null, false);

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

@@ -405,10 +405,10 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         personAccountFed.setSyncDate(new Date());
         personAccountFedMapper.insert(personAccountFed);
 
-//        Map<String, Object> data = new HashMap<>();
-//        data.put("SEQUENCE_NBR", agencyUserModel.getSequenceNbr());
-//        ProduceMsg produceMsg = new ProduceMsg(data, INSERT, agencyUserModel.getUserId());
-//        querueProduce.produceMsg(JSON.toJSONString(produceMsg));
+        Map<String, Object> data = new HashMap<>();
+        data.put("SEQUENCE_NBR", agencyUserModel.getSequenceNbr());
+        ProduceMsg produceMsg = new ProduceMsg(data, INSERT, agencyUserModel.getUserId());
+        querueProduce.produceMsg(JSON.toJSONString(produceMsg));
 
     }
 
@@ -727,10 +727,10 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         personAccountFed.setSyncDate(new Date());
         personAccountFedMapper.updateById(personAccountFed);
 
-//        Map<String, Object> data = new HashMap<>();
-//        data.put("SEQUENCE_NBR", agencyUserModel.getSequenceNbr());
-//        ProduceMsg produceMsg = new ProduceMsg(data, UPDATE, agencyUserModel.getUserId());
-//        querueProduce.produceMsg(JSON.toJSONString(produceMsg));
+        Map<String, Object> data = new HashMap<>();
+        data.put("SEQUENCE_NBR", agencyUserModel.getSequenceNbr());
+        ProduceMsg produceMsg = new ProduceMsg(data, UPDATE, agencyUserModel.getUserId());
+        querueProduce.produceMsg(JSON.toJSONString(produceMsg));
         return model;
     }