三单接口

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxPmqManagementDistributionServiceImpl.java

@@ -83,12 +83,14 @@ public class ZhcxPmqManagementDistributionServiceImpl extends ServiceImpl<ZhcxPm
                         .setConfirmer(zhcxPmqManagementDistributionDo.getConfirmer())
                         .setEstimatedclosedata(zhcxPmqManagementDistributionDo.getEstimatedclosedata())
                         .setSerialnumber(zhcxPmqManagementDistributionDo.getSerialnumber())
-                        .setDistributid(zhcxPmqManagementDistributionDo.getId());
+                        .setDistributid(zhcxPmqManagementDistributionDo.getId())
+                        .setSupplement(zhcxPmqManagementDistributionDo.getSupplement());
                 addList.add(add);
             }else {
                // 更新
                 ZhcxPmqManagementDistributionDetailDo detailDo = details.get(0);
-                detailDo.setEstimatedclosedata(zhcxPmqManagementDistributionDo.getEstimatedclosedata());
+                detailDo.setEstimatedclosedata(zhcxPmqManagementDistributionDo.getEstimatedclosedata())
+                        .setSupplement(zhcxPmqManagementDistributionDo.getSupplement());
                 updateList.add(detailDo);
             }
         }

business-common/src/main/resources/mybatis/business/ZhcxPmqManagementDistributionDao.xml

@@ -14,49 +14,32 @@
 
     <select id="selectListByPidForConfirmer"
             resultType="com.rongwei.bsentity.domain.ZhcxPmqManagementDistributionDo">
-        WITH SplitConfirmers AS (
-            SELECT
-                a.ID,
-                a.DELETED,
-                a.REMARK,
-                a.PID,
-                a.PROJECTID,
-                a.MACHINEID,
-                a.MACHINENO,
-                a.PROJECTNO,
-                a.PROJECTNAME,
-                SUBSTRING_INDEX(SUBSTRING_INDEX(a.CONFIRMERID, ',', n.n), ',', -1) AS CONFIRMERID,
-                SUBSTRING_INDEX(SUBSTRING_INDEX(a.CONFIRMER, ',', n.n), ',', -1) AS CONFIRMER,
-                a.ESTIMATEDCLOSEDATA,
-                a.STATUS,
-                a.SERIALNUMBER
-            FROM
-                INCONTROL.ZHCX_PMQ_MANAGEMENT_DISTRIBUTION a
-                    CROSS JOIN (
-                    SELECT 1 n
-                    UNION ALL SELECT 2
-                    UNION ALL SELECT 3
-                    UNION ALL SELECT 4
-                    UNION ALL SELECT 5
-                    UNION ALL SELECT 6
-                    UNION ALL SELECT 7
-                    UNION ALL SELECT 8
-                    UNION ALL SELECT 9
-                    UNION ALL SELECT 10
-                ) AS n
-            WHERE
-                a.DELETED = '0'
-              AND a.PID = #{pid}
-              AND a.CONFIRMERID IS NOT NULL
-              AND LENGTH(a.CONFIRMERID) - LENGTH(REPLACE(a.CONFIRMERID, ',', '')) >= n.n - 1
-              AND LENGTH(a.CONFIRMER) - LENGTH(REPLACE(a.CONFIRMER, ',', '')) >= n.n - 1
-        )
-        SELECT
-            *
-        FROM
-            SplitConfirmers
-        WHERE
-            CONFIRMERID != ''
+        WITH SplitConfirmers AS (SELECT a.ID,
+                                        a.DELETED,
+                                        a.REMARK,
+                                        a.PID,
+                                        a.PROJECTID,
+                                        a.MACHINEID,
+                                        a.MACHINENO,
+                                        a.PROJECTNO,
+                                        a.PROJECTNAME,
+                                        SUBSTRING_INDEX(SUBSTRING_INDEX(a.CONFIRMERID, ',', n.n), ',',-1) AS CONFIRMERID,
+                                        SUBSTRING_INDEX(SUBSTRING_INDEX(a.CONFIRMER, ',', n.n), ',', -1) AS CONFIRMER,
+                                        a.ESTIMATEDCLOSEDATA,
+                                        a.STATUS,
+                                        a.SERIALNUMBER,
+                                        a.SUPPLEMENT
+                                 FROM INCONTROL.ZHCX_PMQ_MANAGEMENT_DISTRIBUTION a
+                                          CROSS JOIN (SELECT LEVEL AS n
+                                                      FROM DUAL CONNECT BY LEVEL &lt;= 100) AS n
+                                 WHERE a.DELETED = '0'
+                                   AND a.PID = #{pid}
+                                   AND a.CONFIRMERID IS NOT NULL
+                                   AND LENGTH(a.CONFIRMERID) - LENGTH(REPLACE(a.CONFIRMERID, ',', '')) >= n.n - 1
+                                   AND LENGTH(a.CONFIRMER) - LENGTH(REPLACE(a.CONFIRMER, ',', '')) >= n.n - 1)
+        SELECT *
+        FROM SplitConfirmers
+        WHERE CONFIRMERID != ''
     </select>
 
     <select id="getDetailList" resultType="com.rongwei.bsentity.domain.ZhcxPmqManagementDistributionDetailDo">

business-entity/src/main/java/com/rongwei/bsentity/domain/ZhcxPmqManagementDistributionDetailDo.java

@@ -117,6 +117,6 @@ public class ZhcxPmqManagementDistributionDetailDo extends BaseDo implements Ser
     /**
      * 备注说明
      */
-    @TableField("SUPPLEMENT")
-    private String DESCRIPTION;
+    @TableField("DESCRIPTION")
+    private String description;
 }