1.修正作业计划日期

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,

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">

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 ,