From ec15261a49deaecef119b3602460f07db6206ad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Sat, 14 Sep 2024 08:44:13 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=AD=A3=E4=BD=9C=E4=B8=9A=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mappers/jhgk/DmQfxqMapper.xml  | 6 ++++++
 src/main/resources/mappers/jhgk/DmYdjhMapper.xml  | 1 -
 src/main/resources/mappers/pbsc/MpYlxxpMapper.xml | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mappers/jhgk/DmQfxqMapper.xml b/src/main/resources/mappers/jhgk/DmQfxqMapper.xml
index 83d1cbe..5c5c196 100644
--- a/src/main/resources/mappers/jhgk/DmQfxqMapper.xml
+++ b/src/main/resources/mappers/jhgk/DmQfxqMapper.xml
@@ -23,17 +23,23 @@
             dm_sygd_mx.lx,
             dm_sygd_mx.xcms,
             dm_sygd_mx.kw,
+            dm_sygd_mx.slrq,
             dm_sygd_mx.slrq sljhrq,
             dm_sygd_mx.slry,
+            dm_sygd_mx.llrq,
+            dm_sygd_mx.llrq lljhrq,
             dm_sygd_mx.pw,
             dm_sygd_mx.pwry,
             dm_sygd_mx.pwrq,
+            dm_sygd_mx.pwrq pwjhrq,
             dm_sygd_mx.hxsb,
             dm_sygd_mx.hxry,
             dm_sygd_mx.hxrq,
+            dm_sygd_mx.hxrq hxjhrq,
             dm_sygd_mx.qgsb,
             dm_sygd_mx.qgry,
             dm_sygd_mx.qgrq,
+            dm_sygd_mx.qgrq qgjhrq,
             dm_sygd_mx.pwsb,
             dm_sygd_mx.DC_FD,
             dm_sygd_mx.jzbs,
diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
index 8e70fd0..39e5bf4 100644
--- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
+++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.dsic.gj_erp.mapper.jhgk.DmYdjhMapper">
diff --git a/src/main/resources/mappers/pbsc/MpYlxxpMapper.xml b/src/main/resources/mappers/pbsc/MpYlxxpMapper.xml
index e719118..10b3e9b 100644
--- a/src/main/resources/mappers/pbsc/MpYlxxpMapper.xml
+++ b/src/main/resources/mappers/pbsc/MpYlxxpMapper.xml
@@ -85,8 +85,8 @@
         ELSE 0
         END ,
         FHZT = CASE WHEN LEN(RTRIM(QC_ZBSDZP.ZBSH)) >=10 AND (RTRIM(MP_DHSJ.dc_tpmc) = RTRIM(QC_ZBSDZP.GG) AND RTRIM(MP_DHSJ.dc_tpbh) = RTRIM(QC_ZBSDZP.CZ)) THEN '符合'
-        WHEN LEN(RTRIM(QC_ZBSDZP.ZBSH)) >=10 AND (RTRIM(MP_DHSJ.dc_tpmc) <> RTRIM(QC_ZBSDZP.GG) OR RTRIM(MP_DHSJ.dc_tpbh) <> RTRIM(QC_ZBSDZP.CZ)) THEN '不符'
-        WHEN LEN(RTRIM(QC_ZBSDZP.ZBSH)) < 10 THEN ''
+        WHEN LEN(RTRIM(QC_ZBSDZP.ZBSH)) >=10 AND (RTRIM(MP_DHSJ.dc_tpmc) &lt;> RTRIM(QC_ZBSDZP.GG) OR RTRIM(MP_DHSJ.dc_tpbh) &lt;> RTRIM(QC_ZBSDZP.CZ)) THEN '不符'
+        WHEN LEN(RTRIM(QC_ZBSDZP.ZBSH)) &lt; 10 THEN ''
         END,
         '' as xz,
         qc_zbsdzp.gdh ,