阀控查询以及发票服务优化

collect_fees_hdx_api/fees-hdx-api/target/classes/mapper/yhgl/YhKhjbxxMapper.xml

@@ -680,8 +680,7 @@
         SELECT a.yhbh, a.yhxm, a.yhdz,a.lxdh,
         b.sbbh AS sbbh,
         (select NBSYJE from yy_zjzh where yhbh=a.yhbh) bjye,
-        da.cl_cljg tbbz,
-        decode(zl.cl_cljg, '0', '1', decode(zl.ZLVALUE,'true','0','2')) fmzt,
+        b.fmzt fmzt,
         f.cbbmc AS sscbbmc,
         g.cbpqmc AS sscbpqmc,
         d.name AS sblbmc,
@@ -692,20 +691,6 @@
         LEFT JOIN bm_cbb f ON a.sscbb = f.cbbbm
         LEFT JOIN bm_cbpq g ON a.sscbpq = g.cbpqbm
         LEFT JOIN bm_sbsccj h on b.sbsccj=h.code
-        LEFT JOIN (
-        select * from(
-        select a.*,row_number() over (partition by YHBH,CBKH order by CZSJ desc) as rn from
-        znb_da_log a)
-        where rn=1
-        ) da ON b.yhbh=da.yhbh and b.cbkh=da.cbkh
-        LEFT JOIN (
-        select * from(
-        select a.*,row_number() over (partition by YHBH,CBKH order by CZSJ desc) as rn from
-        znb_zl_log a
-        where a.zltype='1'
-        )
-        where rn=1
-        ) zl ON b.yhbh=zl.yhbh and b.cbkh=zl.cbkh
         WHERE 1=1 AND b.sblb in ('2','3')
         <!--模糊查询 -->
         <if test="filter.searchText!=null">

dzfpkp-nst/src/main/java/com/tofly/dzfp/common/DzfpService.java

@@ -583,7 +583,7 @@ public class DzfpService {
                     .set(EiFpkjRequest::getClRemessage, "")
                     .eq(EiFpkjRequest::getLsbh, orderNo)
                     .update();
-        }else {
+        } else {
             eiFpkjRequestService.lambdaUpdate()
                     .set(EiFpkjRequest::getClCljg, 2)
                     .set(EiFpkjRequest::getClLock, 1)
@@ -1110,22 +1110,28 @@ public class DzfpService {
                             if (yysspjxxcount > 0) {
                                 if ("3".equals(eiFpkjRequest.getKpywlx())) {
                                     tf = yySspjxxService.lambdaUpdate()
-                                            .set(YySspjxx::getFpz3, jsonObject.getString("invoiceCode"))
-                                            .set(YySspjxx::getFph3, jsonObject.getString("invoiceNo"))
+                                            //.set(YySspjxx::getFpz3, jsonObject.getString("invoiceCode"))
+                                            //.set(YySspjxx::getFph3, jsonObject.getString("invoiceNo"))
+                                            .set(YySspjxx::getFpz3, "")
+                                            .set(YySspjxx::getFph3, "")
                                             .set(YySspjxx::getFplx, 2)
                                             .eq(YySspjxx::getFpglh, eiFpkjRequest.getSfid())
                                             .update();
                                 } else if ("2".equals(eiFpkjRequest.getKpywlx())) {
                                     tf = yySspjxxService.lambdaUpdate()
-                                            .set(YySspjxx::getFpz1, jsonObject.getString("invoiceCode"))
-                                            .set(YySspjxx::getFph1, jsonObject.getString("invoiceNo"))
+                                            //.set(YySspjxx::getFpz1, jsonObject.getString("invoiceCode"))
+                                            //set(YySspjxx::getFph1, jsonObject.getString("invoiceNo"))
+                                            .set(YySspjxx::getFpz1, "")
+                                            .set(YySspjxx::getFph1, "")
                                             .set(YySspjxx::getFplx, 2)
                                             .eq(YySspjxx::getFpglh, eiFpkjRequest.getSfid())
                                             .update();
                                 } else {
                                     tf = yySspjxxService.lambdaUpdate()
-                                            .set(YySspjxx::getFpz, jsonObject.getString("invoiceCode"))
-                                            .set(YySspjxx::getFph, jsonObject.getString("invoiceNo"))
+                                            //.set(YySspjxx::getFpz, jsonObject.getString("invoiceCode"))
+                                            //.set(YySspjxx::getFph, jsonObject.getString("invoiceNo"))
+                                            .set(YySspjxx::getFpz, "")
+                                            .set(YySspjxx::getFph, "")
                                             .set(YySspjxx::getFplx, 2)
                                             .eq(YySspjxx::getFpglh, eiFpkjRequest.getSfid())
                                             .update();