zjh 本地 2024/03/6 -2

zjh

2024-03-06 dc23d54849571d2bd38f6f8e1dfdb849047532f6

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java

@@ -317,7 +317,12 @@
                List<LtkjHysqd> one = testMapper.getHysqdByTmh(order.getCardId());
                if (one != null && one.size() > 0) {
                    for (LtkjHysqd ltkjHysqd : one) {
//                        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
//                        LambdaQueryWrapper<LtkjHysqd> wq0=new LambdaQueryWrapper<>();
//                        wq0.eq(LtkjHysqd::getTjh,ltkjHysqd.getTjh());
//                        wq0.eq(LtkjHysqd::getTmh,ltkjHysqd.getTmh());
//                        ltkjHysqdService.remove(wq0);
                        ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
                        ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(ltkjHysqd.getTmh());
                        LtkjHysqd hysqd = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
                        if (hysqd == null) {
                            ltkjHysqdService.save(ltkjHysqd);
@@ -652,6 +657,9 @@
                if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
                    for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                        if(remark.getProId().equals(tjOrderDetail.getProId())){
                            if(null !=tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")){
                                tjOrderDetail.setProResult(tjOrderDetail.getProResult()+" ["+tjOrderDetail.getYcbz()+"]");
                            }
                            dels.add(tjOrderDetail);
                        }
                    }