Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/baosight/hggp/common/DdynamicEnum.java

@@ -209,7 +209,7 @@ public enum DdynamicEnum {
      * 用途：设备名称下拉框
      * 编写：ly
      */
-    DEVICE_CODE_BOX_BLOCK_ID("deviceCodeBox_block_id","deviceCode","deviceName","deviceType", "companyCode","HGSB001.queryDeviceCodeBox"),
+    DEVICE_CODE_BOX_BLOCK_ID("deviceCodeBox_block_id","deviceCode","deviceName","deviceType", "companyCode","deviceStatus","HGSB001.queryDeviceCodeBox"),
 
     //------------------------------------- 生产管理---------------------------------------------------
     /**

src/main/java/com/baosight/hggp/hg/sb/sql/HGSB001.xml

@@ -373,7 +373,8 @@
 			DEVICE_CODE	as "deviceCode",  <!-- 设备编码 -->
 			DEVICE_NAME	as "deviceName",  <!-- 设备名称 -->
 			DEVICE_TYPE	as "deviceType",  <!-- 设备类型 -->
-			COMPANY_CODE	as "companyCode"
+			COMPANY_CODE	as "companyCode",
+			DEVICE_STATUS    as "deviceStatus"
 		FROM ${hggpSchema}.HGSB001 WHERE 1=1
 		<include refid="condition" />
 	</select>

src/main/java/com/baosight/hggp/hg/sb/sql/HGSB005.xml

@@ -125,7 +125,7 @@
 			UPKEEP_CODE = #upkeepCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="planCode">
-			PLAN_CODE = #planCode#
+			PLAN_CODE LIKE CONCAT('%', #planCode#, '%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="planStartDate">
 			PLAN_START_DATE = #planStartDate#

src/main/webapp/HG/SB/HGSB002A.js

@@ -50,7 +50,7 @@ $(function () {
                         if(deviceType) {
                             // 返回我们过滤后的数据集
                             return _.filter(deviceCodeBox, function (item) {
-                                return item["param1Field"]==deviceType;
+                                return item["param1Field"]==deviceType && item["param3Field"] == "true";
                             })
                         }
                         return deviceCodeBox;

src/main/webapp/HG/SB/HGSB003.js

@@ -67,7 +67,7 @@ $(function () {
                         if(companyCode) {
                             // 返回我们过滤后的数据集
                             return _.filter(deviceCodeBox, function (item) {
-                                return item["param2Field"] === companyCode;
+                                return item["param2Field"] === companyCode && item["param3Field"] == "true";
                             })
                         }
                         return deviceCodeBox;

src/main/webapp/HG/SB/HGSB005.js

@@ -25,7 +25,7 @@ $(function () {
                         if (item.companyCode) {
                             if (auditStatus == 1){
                                 template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
-                                    + 'onclick="showDetail(' + item.id + ',\''+item.companyCode+'\',\''+item.companyName+'\')"  >点检详情</a>';
+                                    + 'onclick="showDetail(' + item.id + ',\''+item.companyCode+'\',\''+item.companyName+'\')"  >保养详情</a>';
                             }
                             if (auditStatus == 0) {
                                 template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +

src/main/webapp/HG/SB/HGSB006.js

@@ -25,10 +25,10 @@ $(function () {
                     field: "checkStatus",
                     template: function (item) {
                         let template = '';
-                        if (isBlank(item.checkResult.trim()) || isBlank(item.docId.trim())){
-                            return "未点检";
-                        }else {
+                        if (!isBlank(item.checkResult.trim()) || !isBlank(item.docId.trim())){
                             return "已点检";
+                        }else {
+                            return "未点检";
                         }
                     }
                 }, {

src/main/webapp/HG/SB/HGSB007.js

@@ -112,10 +112,10 @@ $(function () {
                     field: "upkeepStatus",
                     template: function (item) {
                         let template = '';
-                        if (isBlank(item.checkResult.trim()) || isBlank(item.docId.trim())){
-                            return "未保养";
-                        }else {
+                        if (!isBlank(item.checkResult.trim()) || !isBlank(item.docId.trim())){
                             return "已保养";
+                        }else {
+                            return "未保养";
                         }
                     }
                 }, {