2024-05-23 更改设备管理

src/main/java/com/baosight/hggp/hg/sb/domain/HGSB002.java

 package com.baosight.hggp.hg.sb.domain;
 
+import com.baosight.hggp.util.DateUtils;
 import com.baosight.iplat4j.core.util.NumberUtils;
 import com.baosight.iplat4j.core.ei.EiColumn;
 import com.baosight.iplat4j.core.data.DaoEPBase;
@@ -638,11 +639,11 @@ public class HGSB002 extends DaoEPBase {
 		setFactoryName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_NAME)), factoryName));
 		setGroupCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_GROUP_CODE)), groupCode));
 		setGroupName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_GROUP_NAME)), groupName));
-		setPlanDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PLAN_DATE)), planDate));
+		setPlanDate(StringUtils.defaultIfEmpty(StringUtils.toString(DateUtils.formatShort(map.get(FIELD_PLAN_DATE))), planDate));
 		setPlanCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PLAN_CODE)), planCode));
 		setPlanType(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_PLAN_TYPE)), planType));
-		setPlanStartDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PLAN_START_DATE)), planStartDate));
-		setPlanEndDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PLAN_END_DATE)), planEndDate));
+		setPlanStartDate(StringUtils.defaultIfEmpty(StringUtils.toString(DateUtils.formatShort(map.get(FIELD_PLAN_START_DATE))), planStartDate));
+		setPlanEndDate(StringUtils.defaultIfEmpty(StringUtils.toString(DateUtils.formatShort(map.get(FIELD_PLAN_END_DATE))), planEndDate));
 		setPlanUserId(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PLAN_USER_ID)), planUserId));
 		setPlanUserName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PLAN_USER_NAME)), planUserName));
 		setPlanStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_PLAN_STATUS)), planStatus));

src/main/java/com/baosight/hggp/hg/sb/domain/HGSB003.java

 package com.baosight.hggp.hg.sb.domain;
 
+import com.baosight.hggp.util.DateUtil;
+import com.baosight.hggp.util.DateUtils;
 import com.baosight.iplat4j.core.util.NumberUtils;
 import com.baosight.iplat4j.core.ei.EiColumn;
 import com.baosight.iplat4j.core.data.DaoEPBase;
@@ -591,7 +593,7 @@ public class HGSB003 extends DaoEPBase {
 		setDeleteFlag(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DELETE_FLAG)), deleteFlag));
 		setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_CODE)), companyCode));
 		setCompanyName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_NAME)), companyName));
-		setApplyDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_APPLY_DATE)), applyDate));
+		setApplyDate(StringUtils.defaultIfEmpty(StringUtils.toString(DateUtils.formatShort(map.get(FIELD_APPLY_DATE))), applyDate));
 		setApplyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_APPLY_CODE)), applyCode));
 		setDeviceCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEVICE_CODE)), deviceCode));
 		setDeviceName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEVICE_NAME)), deviceName));

src/main/java/com/baosight/hggp/hg/sb/domain/HGSB004.java

 package com.baosight.hggp.hg.sb.domain;
 
+import com.baosight.hggp.util.DateUtils;
 import com.baosight.iplat4j.core.util.NumberUtils;
 import com.baosight.iplat4j.core.ei.EiColumn;
 import com.baosight.iplat4j.core.data.DaoEPBase;
@@ -578,7 +579,7 @@ public class HGSB004 extends DaoEPBase {
 		setCompanyName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_NAME)), companyName));
 		setFactoryCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_CODE)), factoryCode));
 		setFactoryName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_NAME)), factoryName));
-		setInspecDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INSPEC_DATE)), inspecDate));
+		setInspecDate(StringUtils.defaultIfEmpty(StringUtils.toString(DateUtils.formatShort(map.get(FIELD_INSPEC_DATE))), inspecDate));
 		setInspecCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INSPEC_CODE)), inspecCode));
 		setPlanCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PLAN_CODE)), planCode));
 		setPlanStartDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PLAN_START_DATE)), planStartDate));

src/main/java/com/baosight/hggp/hg/sb/domain/HGSB005.java

 package com.baosight.hggp.hg.sb.domain;
 
+import com.baosight.hggp.util.DateUtils;
 import com.baosight.iplat4j.core.util.NumberUtils;
 import com.baosight.iplat4j.core.ei.EiColumn;
 import com.baosight.iplat4j.core.data.DaoEPBase;
@@ -577,7 +578,7 @@ public class HGSB005 extends DaoEPBase {
 		setCompanyName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_NAME)), companyName));
 		setFactoryCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_CODE)), factoryCode));
 		setFactoryName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_NAME)), factoryName));
-		setUpkeepDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPKEEP_DATE)), upkeepDate));
+		setUpkeepDate(StringUtils.defaultIfEmpty(StringUtils.toString(DateUtils.formatShort(map.get(FIELD_UPKEEP_DATE))), upkeepDate));
 		setUpkeepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPKEEP_CODE)), upkeepCode));
 		setPlanCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PLAN_CODE)), planCode));
 		setPlanStartDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PLAN_START_DATE)), planStartDate));

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB002.java

@@ -62,9 +62,13 @@ public class ServiceHGSB002 extends ServiceEPBase {
     public EiInfo query(EiInfo inInfo) {
         EiBlock block = inInfo.getBlock(EiConstant.queryBlock);
         block.setCell(ACConstants.ROW_CODE_0, HGSB002.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
-        String planDate = block.getCellStr(ACConstants.ROW_CODE_0,HGSB002.FIELD_PLAN_DATE);
-        if (!planDate.isEmpty()) {
-            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGSB002.FIELD_PLAN_DATE, StringUtil.removeHorizontalLine(planDate));
+        String startDate = block.getCellStr(ACConstants.ROW_CODE_0,ACConstants.SQL_START_DATE);
+        String endDate = block.getCellStr(ACConstants.ROW_CODE_0,ACConstants.SQL_END_DATE);
+        if (!startDate.isEmpty()) {
+            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,ACConstants.SQL_START_DATE, StringUtil.removeHorizontalLine(startDate));
+        }
+        if (!endDate.isEmpty()){
+            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,ACConstants.SQL_END_DATE, StringUtil.removeHorizontalLine(endDate));
         }
         return super.query(inInfo,HGSB002.QUERY,new HGSB002());
     }
@@ -80,6 +84,10 @@ public class ServiceHGSB002 extends ServiceEPBase {
                 Map<?, ?> map = eiBlock.getRow(i);
                 hgsb002.fromMap(map);
                 hgsb002.setDeleteFlag(CommonConstant.YesNo.YES_1);
+                if (hgsb002.getPlanStatus()==1) {
+                    String str = "设备计划已审批完成，无法删除！";
+                    throw new PlatException(str);
+                }
                 DaoUtils.update(HGSB002.DELETE_FLAG, hgsb002.toMap());
             }
             inInfo.setStatus(EiConstant.STATUS_SUCCESS);

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB002A.java

@@ -87,17 +87,24 @@ public class ServiceHGSB002A extends ServiceEPBase {
     public EiInfo save(EiInfo inInfo) {
         try {
             List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+            Long parentId = Long.valueOf(inInfo.getCellStr(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB002A.FIELD_PARENT_ID));
+            HGSB002 hgsb002 = HGSBTools.Hgsb002.get(parentId);
+            List<HGSB002A> hgsb002AList = HGSBTools.Hgsb002.getDetails(parentId);
             // 写入数据
             for (Map resultRow : resultRows) {
                 HGSB002A hgsb002a = new HGSB002A();
                 hgsb002a.fromMap(resultRow);
-                Long parentId = Long.valueOf(inInfo.getCellStr(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB002A.FIELD_PARENT_ID));
-                HGSB002 hgsb002 = HGSBTools.Hgsb002.get(parentId);
-                // 任务状态==1抛出异常
-                if (hgsb002.getTaskStatus()==1) {
-                    String str = hgsb002.getPlanType() == 1?"设备计划已生成点检任务，添加失败":"设备计划已生成保养任务，添加失败";
+                // 状态==1抛出异常
+                if (hgsb002.getPlanStatus()==1) {
+                    String str = "设备计划已审批完成，添加失败！";
                     throw new PlatException(str);
                 }
+                for (HGSB002A hgsb002a1: hgsb002AList) {
+                    if (hgsb002a1.getDeviceCode().equals(hgsb002a.getDeviceCode())) {
+                        String str = String.format("设备计划详情[%s]设备已添加，无法重复添加失败！",hgsb002a.getDeviceName());
+                        throw new PlatException(str);
+                    }
+                }
                 if (hgsb002a.getId() == null || hgsb002a.getId() == 0) {
                     hgsb002a.setParentId(parentId);
                     this.add(hgsb002a);

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB003.java

@@ -6,6 +6,7 @@ import com.baosight.hggp.core.constant.CommonConstant;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.constant.HGConstant;
+import com.baosight.hggp.hg.sb.domain.HGSB002;
 import com.baosight.hggp.hg.sb.domain.HGSB003;
 import com.baosight.hggp.hg.sb.tools.HGSBTools;
 import com.baosight.hggp.hg.xs.domain.Org;
@@ -36,23 +37,25 @@ public class ServiceHGSB003 extends ServiceEPBase {
 
     @Override
     public EiInfo initLoad(EiInfo inInfo) {
+        EiInfo outInfo = super.initLoad(inInfo,new HGSB003());
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB003.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
-        inInfo = super.query(inInfo, HGSB003.QUERY, new HGSB003());
+        outInfo = super.query(inInfo, HGSB003.QUERY, new HGSB003());
         Map qarma = new HashMap();
         if (!HGSBTools.getRoleDataAuth()){
             String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
             qarma.put(User.FIELD_USER_ID,userId);
         }
-        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
         qarma.clear();
         List<String> orgIds = HGSBTools.getOrgId();
         qarma.put(Org.FIELD_ORG_ID,orgIds);
-        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_ID_BOX_BLOCK_ID),qarma);
-        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.DEVICE_CODE_BOX_BLOCK_ID),
-                new HashMap<String,Object>(){{
-                    put(HGSB003.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);}}
-        );
-        return inInfo;
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.USER_ID_BOX_BLOCK_ID),qarma);
+        qarma.clear();
+        Map userCompany = HGSBTools.getUserCompany();
+        qarma.put(HGSB003.FIELD_COMPANY_CODE,userCompany.get(HGSB002.FIELD_COMPANY_CODE));
+        qarma.put(HGSB003.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.DEVICE_CODE_BOX_BLOCK_ID), qarma);
+        return outInfo;
     }
 
     @Override

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB004.java

@@ -37,14 +37,15 @@ public class ServiceHGSB004 extends ServiceEPBase {
 
     @Override
     public EiInfo initLoad(EiInfo inInfo) {
+        EiInfo outInfo = super.initLoad(inInfo,new HGSB004());
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB004.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
-        inInfo = super.query(inInfo, HGSB004.QUERY, new HGSB004());
+        outInfo = super.query(inInfo, HGSB004.QUERY, new HGSB004());
         Map qarma = new HashMap();
         if (!HGSBTools.getRoleDataAuth()){
             String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
             qarma.put(User.FIELD_USER_ID,userId);
         }
-        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
         qarma.clear();
         /*Map userCompany = HGSBTools.getUserCompany();
         if (!userCompany.isEmpty()) {
@@ -54,8 +55,8 @@ public class ServiceHGSB004 extends ServiceEPBase {
         qarma.clear();*/
         List<String> orgIds = HGSBTools.getOrgId();
         qarma.put(Org.FIELD_ORG_ID,orgIds);
-        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_ID_BOX_BLOCK_ID),qarma);
-        return inInfo;
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.USER_ID_BOX_BLOCK_ID),qarma);
+        return outInfo;
     }
 
     @Override
@@ -80,6 +81,10 @@ public class ServiceHGSB004 extends ServiceEPBase {
                 Map<?, ?> map = eiBlock.getRow(i);
                 hgsb004.fromMap(map);
                 hgsb004.setDeleteFlag(CommonConstant.YesNo.YES_1);
+                if (hgsb004.getCheckStatus()==1) {
+                    String str = "设备点检已审批完成，无法删除！";
+                    throw new PlatException(str);
+                }
                 DaoUtils.update(HGSB004.DELETE_FLAG, hgsb004.toMap());
             }
             inInfo.setStatus(EiConstant.STATUS_SUCCESS);

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB004B.java

@@ -33,6 +33,7 @@ public class ServiceHGSB004B extends ServiceEPBase {
     public EiInfo initLoad(EiInfo inInfo) {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB002.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB002.FIELD_TASK_STATUS, CommonConstant.YesNo.NO_0);
+        inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB002.FIELD_PLAN_STATUS, CommonConstant.YesNo.YES_1);
         inInfo = super.query(inInfo, HGSB002.QUERY, new HGSB002());
         Map qarma = new HashMap();
         if (!HGSBTools.getRoleDataAuth()){

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB005.java

@@ -34,30 +34,31 @@ public class ServiceHGSB005 extends ServiceEPBase {
 
     @Override
     public EiInfo initLoad(EiInfo inInfo) {
+        EiInfo outInfo = super.initLoad(inInfo,new HGSB005());
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB005.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
-        inInfo = super.query(inInfo, HGSB005.QUERY, new HGSB005());
+        outInfo = super.query(inInfo, HGSB005.QUERY, new HGSB005());
         Map qarma = new HashMap();
         if (!HGSBTools.getRoleDataAuth()){
             String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
             qarma.put(User.FIELD_USER_ID,userId);
         }
-        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
         qarma.clear();
 
         Map userCompany = HGSBTools.getUserCompany();
         if (!userCompany.isEmpty()) {
             qarma.put(Org.FIELD_PARENT_ORG_ID,userCompany.get(HGSB002.FIELD_COMPANY_CODE));
         }
-        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.GROUP_RECORD_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.GROUP_RECORD_BLOCK_ID),qarma);
         qarma.clear();
 
         List<String> orgIds = HGSBTools.getOrgId();
         qarma.put(Org.FIELD_ORG_ID,orgIds);
-        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_ID_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.USER_ID_BOX_BLOCK_ID),qarma);
         /*CommonMethod.initBlock(inInfo,
                 Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID,DdynamicEnum.USER_BLOCK_ID,DdynamicEnum.GROUP_CODE_BOX_BLOCK_ID),null
         );*/
-        return inInfo;
+        return outInfo;
     }
 
     @Override
@@ -82,6 +83,10 @@ public class ServiceHGSB005 extends ServiceEPBase {
                 Map<?, ?> map = eiBlock.getRow(i);
                 hgsb005.fromMap(map);
                 hgsb005.setDeleteFlag(CommonConstant.YesNo.YES_1);
+                if (hgsb005.getCheckStatus()==1) {
+                    String str = "设备保养已审批完成，无法删除！";
+                    throw new PlatException(str);
+                }
                 DaoUtils.update(HGSB005.DELETE_FLAG, hgsb005.toMap());
             }
             inInfo.setStatus(EiConstant.STATUS_SUCCESS);

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB006.java

@@ -25,19 +25,19 @@ public class ServiceHGSB006 extends ServiceEPBase {
 
     @Override
     public EiInfo initLoad(EiInfo inInfo) {
+        EiInfo outInfo = super.initLoad(inInfo,new HGSB006());
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB006.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB004.FIELD_INIT_CHECK_STATUS, CommonConstant.YesNo.YES_1);
-        inInfo = super.query(inInfo, HGSB006.QUERY, new HGSB006());
+        outInfo = super.query(inInfo, HGSB006.QUERY, new HGSB006());
         Map qarma = new HashMap();
         if (!HGSBTools.getRoleDataAuth()){
             String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
             qarma.put(User.FIELD_USER_ID,userId);
         }
-        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
-        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.DEVICE_CODE_BOX_BLOCK_ID),null
-        );
-        inInfo.getBlock(EiConstant.queryBlock).removeCol(HGSB004.FIELD_CHECK_STATUS);
-        return inInfo;
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.DEVICE_CODE_BOX_BLOCK_ID),null);
+        //outInfo.getBlock(EiConstant.queryBlock).removeCol(HGSB004.FIELD_CHECK_STATUS);
+        return outInfo;
     }
 
     @Override

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB007.java

@@ -3,6 +3,7 @@ package com.baosight.hggp.hg.sb.service;
 import com.baosight.hggp.common.DdynamicEnum;
 import com.baosight.hggp.core.constant.CommonConstant;
 import com.baosight.hggp.core.security.UserSessionUtils;
+import com.baosight.hggp.hg.sb.domain.HGSB002;
 import com.baosight.hggp.hg.sb.domain.HGSB004;
 import com.baosight.hggp.hg.sb.domain.HGSB005;
 import com.baosight.hggp.hg.sb.domain.HGSB007;
@@ -27,17 +28,18 @@ public class ServiceHGSB007 extends ServiceEPBase {
 
     @Override
     public EiInfo initLoad(EiInfo inInfo) {
+        EiInfo outInfo = super.initLoad(inInfo,new HGSB007());
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB007.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB005.FIELD_CHECK_STATUS, CommonConstant.YesNo.YES_1);
-        inInfo = super.query(inInfo, HGSB007.QUERY, new HGSB007(),false, new EiBlockMeta(), EiConstant.queryBlock, CommonConstant.Field.DETAIL, CommonConstant.Field.DETAIL);
+        outInfo = super.query(inInfo, HGSB007.QUERY, new HGSB007(),false, new EiBlockMeta(), EiConstant.queryBlock, CommonConstant.Field.DETAIL, CommonConstant.Field.DETAIL);
         Map qarma = new HashMap();
         if (!HGSBTools.getRoleDataAuth()){
             String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
             qarma.put(User.FIELD_USER_ID,userId);
         }
-        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
-        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.DEVICE_CODE_BOX_BLOCK_ID),null);
-        return inInfo;
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.DEVICE_CODE_BOX_BLOCK_ID),null);
+        return outInfo;
     }
 
     @Override

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

@@ -156,6 +156,12 @@
 		<isNotEmpty prepend=" AND " property="taskStatus">
 			TASK_STATUS = #taskStatus#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="startDate">
+			PLAN_DATE >= #startDate#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="endDate">
+			PLAN_DATE &lt;= #endDate#
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"

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

@@ -139,7 +139,7 @@
 			APPLY_USER_ID = #applyUserId#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="applyUserName">
-			APPLY_USER_NAME = #applyUserName#
+			APPLY_USER_NAME LIKE CONCAT('%', #applyUserName#, '%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="status">
 			STATUS = #status#

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

@@ -137,7 +137,7 @@
 			UPKEEP_USER_ID = #upkeepUserId#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="upkeepUserName">
-			UPKEEP_USER_NAME = #upkeepUserName#
+			UPKEEP_USER_NAME LIKE CONCAT('%', #upkeepUserName#, '%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="checkStatus">
 			CHECK_STATUS LIKE CONCAT('%', #checkStatus#, '%')

src/main/java/com/baosight/hggp/hg/sj/service/ServiceHGSJ001.java

@@ -7,6 +7,7 @@ import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.sj.domain.HGSJ001;
+import com.baosight.hggp.hg.sj.domain.HGSJ002;
 import com.baosight.hggp.hg.sj.domain.HGSJ002A;
 import com.baosight.hggp.hg.xs.domain.Org;
 import com.baosight.hggp.hg.xs.domain.User;
@@ -33,16 +34,17 @@ public class ServiceHGSJ001 extends ServiceEPBase {
     @Override
     public EiInfo initLoad(EiInfo inInfo) {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSJ001.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);
-        inInfo = super.query(inInfo, HGSJ001.QUERY, new HGSJ001());
+        EiInfo outInfo = super.initLoad(inInfo,new HGSJ002());
+        outInfo = super.query(inInfo, HGSJ001.QUERY, new HGSJ001());
         Map qarma = new HashMap();
         String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
         qarma.put(User.FIELD_USER_ID,userId);
-        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
         qarma.clear();
         List orgIds = getOrgId();
         qarma.put(Org.FIELD_ORG_ID,orgIds);
-        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_ID_BOX_BLOCK_ID),qarma);
-        return inInfo;
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.USER_ID_BOX_BLOCK_ID),qarma);
+        return outInfo;
     }
 
     @Override

src/main/java/com/baosight/hggp/hg/sj/service/ServiceHGSJ002.java

@@ -35,12 +35,13 @@ public class ServiceHGSJ002 extends ServiceEPBase {
     @Override
     public EiInfo initLoad(EiInfo inInfo) {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSJ002.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
-        inInfo = super.query(inInfo, HGSJ002.QUERY, new HGSJ002());
+        EiInfo outInfo = super.initLoad(inInfo,new HGSJ002());
+        outInfo = super.query(inInfo, HGSJ002.QUERY, new HGSJ002());
         Map qarma = new HashMap();
         String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
         qarma.put(User.FIELD_USER_ID,userId);
-        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
-        return inInfo;
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
+        return outInfo;
     }
 
     @Override

src/main/java/com/baosight/hggp/hg/sj/service/ServiceHGSJ002A.java

@@ -5,6 +5,7 @@ import com.baosight.hggp.common.DdynamicEnum;
 import com.baosight.hggp.core.constant.CommonConstant;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.core.enums.OrgTypeEnum;
+import com.baosight.hggp.hg.sj.domain.HGSJ002;
 import com.baosight.hggp.hg.sj.domain.HGSJ002A;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.ErrorCodeUtils;
@@ -34,12 +35,13 @@ public class ServiceHGSJ002A extends ServiceEPBase {
         //inInfo.setCell(EiConstant.queryBlock,ACConstants.ROW_CODE_0,HGPZ002A.FIELD_PARENT_ID,inInfo.get("inqu_status-0-parendId"));
         //inInfo.setCell(EiConstant.queryBlock,ACConstants.ROW_CODE_0,HGPZ002A.FIELD_FLOW_CODE,inInfo.get("inqu_status-0-flowCode"));
         String factoryCode = inInfo.getCell(EiConstant.queryBlock,ACConstants.ROW_CODE_0,HGSJ002A.FIELD_FACTORY_CODE).toString();
-        inInfo = super.query(inInfo, HGSJ002A.QUERY, new HGSJ002A());
-        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID,DdynamicEnum.PROCESS_CODE_BLOCK_ID),
+        EiInfo outInfo = super.initLoad(inInfo,new HGSJ002());
+        outInfo = super.query(inInfo, HGSJ002A.QUERY, new HGSJ002A());
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID,DdynamicEnum.PROCESS_CODE_BLOCK_ID),
                 new HashMap<String,Object>(){{
                     put(HGSJ002A.FIELD_FACTORY_CODE,factoryCode);
                 }});
-        return inInfo;
+        return outInfo;
     }
 
     @Override

src/main/java/com/baosight/hggp/hg/sj/service/ServiceHGSJ003.java

@@ -38,7 +38,8 @@ public class ServiceHGSJ003 extends ServiceEPBase {
     @Override
     public EiInfo initLoad(EiInfo inInfo) {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSJ003.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
-        inInfo = super.query(inInfo, HGSJ003.QUERY, new HGSJ003());
+        EiInfo outInfo = super.initLoad(inInfo,new HGSJ002());
+        outInfo = super.query(inInfo, HGSJ003.QUERY, new HGSJ003());
         List asList = new ArrayList<>();
         Map qarma = new HashMap();
         String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
@@ -56,8 +57,8 @@ public class ServiceHGSJ003 extends ServiceEPBase {
                 qarma.put(HGSJ002A.FIELD_FACTORY_CODE,org.getOrgId());
             }
         }
-        CommonMethod.initBlock(inInfo, asList, qarma);
-        return inInfo;
+        CommonMethod.initBlock(outInfo, asList, qarma);
+        return outInfo;
     }
 
     @Override

src/main/java/com/baosight/hggp/util/contants/ACConstants.java

@@ -12,6 +12,16 @@ public class ACConstants {
     public static final char ROW_CODE_0 = 0;
 
     /**
+     * sql 条件开始日期
+     */
+    public static final String SQL_START_DATE = "startDate";
+
+    /**
+     * sql 条件结束日期
+     */
+    public static final String SQL_END_DATE = "endDate";
+
+    /**
      * sql 条件统计数目方法
      */
     public static final String SQL_COUNT = "count";

src/main/webapp/HG/SB/HGSB001.jsp

@@ -46,28 +46,28 @@
             <EF:EFComboColumn ename="companyCode" cname="公司名称"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
-                              maxLength="16" readonly="true" width="120" required="true"
+                              maxLength="16" readonly="false" width="120" required="false"
                               align="center" filter="contains" sort="true">
                 <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFComboColumn ename="groupCode" cname="设备区域"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
-                              maxLength="16" readonly="true" width="120" required="true"
+                              maxLength="16" readonly="false" width="120" required="true"
                               align="center" filter="contains" sort="true">
                 <EF:EFOptions blockId="group_record_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFComboColumn ename="deviceType" cname="设备类型"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
-                              maxLength="16" width="80" readonly="true" required="true"
+                              maxLength="16" width="80" readonly="false" required="true"
                               align="center" filter="contains" sort="true">
                 <EF:EFCodeOption codeName="hpjx.hpsb.deviceType" />
             </EF:EFComboColumn>
             <EF:EFColumn ename="deviceCode" cname="设备编码" width="100" enable="true" readonly="true" align="center" required="true"/>
-            <EF:EFColumn ename="deviceName" cname="设备名称" width="160" enable="true" readonly="true" align="center" required="true"/>
-            <EF:EFColumn ename="deviceModel" cname="设备型号" width="120" enable="true" readonly="true" align="center" required="true"/>
-            <EF:EFColumn ename="purchaseDate" cname="购置日期" width="120" enable="true" readonly="true" align="center" editType="date"
+            <EF:EFColumn ename="deviceName" cname="设备名称" width="160" enable="true" readonly="false" align="center" required="true"/>
+            <EF:EFColumn ename="deviceModel" cname="设备型号" width="120" enable="true" readonly="false" align="center" required="true"/>
+            <EF:EFColumn ename="purchaseDate" cname="购置日期" width="120" enable="true" readonly="false" align="center" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
             <EF:EFColumn ename="maintainDate" cname="保养日期" width="120" align="center" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" readonly="false" required="true"/>

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

@@ -260,6 +260,7 @@ let save = function (btnNode) {
         let planStartDate= item.get("planStartDate");
         let planEndDate= item.get("planEndDate");
         let planUserId= item.get("planUserId");
+        let planStatus= item.get("planStatus");
         if(isBlank(companyCode)){
             message("选中的第"+(index+1)+"行\"公司\"，不能为空!");
             flag = false;
@@ -295,6 +296,11 @@ let save = function (btnNode) {
             flag = false;
             return false;
         }
+        if(planStatus == 1){
+            message("选中的第"+(index+1)+"行\"已经审批完成\"，不能修改!");
+            flag = false;
+            return false;
+        }
     });
     if(flag) {
         JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
@@ -307,23 +313,25 @@ let save = function (btnNode) {
 }
 
 function updateStatus(id,deviceStatus) {
-    let inEiInfo = new EiInfo();
-    inEiInfo.set("result-0-id", id);
-    inEiInfo.set("result-0-planStatus", deviceStatus);
-    EiCommunicator.send('HGSB002', 'updateStatus', inEiInfo, {
-            onSuccess(response) {
-                NotificationUtil(response.msg);
-                query();
-            },
-            onFail(errorMessage, status, e) {
-                NotificationUtil("执行失败！", "error");
-            }
-        }, {
-            async: false
+    JSUtils.confirm("确定是否\"审批完成\"操作? ", {
+        ok: function () {
+            let inEiInfo = new EiInfo();
+            inEiInfo.set("result-0-id", id);
+            inEiInfo.set("result-0-planStatus", deviceStatus);
+            EiCommunicator.send('HGSB002', 'updateStatus', inEiInfo, {
+                    onSuccess(response) {
+                        NotificationUtil(response.msg);
+                        query();
+                    },
+                    onFail(errorMessage, status, e) {
+                        NotificationUtil("执行失败！", "error");
+                    }
+                }, {
+                    async: false
+                }
+            )
         }
-    );
-
-
+    });
 }
 
 /**

src/main/webapp/HG/SB/HGSB002.jsp

@@ -33,8 +33,9 @@
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFCodeOption codeName="hggp.hgsb.planType"/>
             </EF:EFSelect>
-            <EF:EFDatePicker blockId="inqu_status" row="0" ename="planDate" cname="计划日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
             <EF:EFInput blockId="inqu_status" row="0" ename="planUserName" cname="计划人" placeholder="模糊查询" colWidth="3"/>
+            <EF:EFDatePicker blockId="inqu_status" row="0" ename="startDate" cname="计划开始日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
+            <EF:EFDatePicker blockId="inqu_status" row="0" ename="endDate" cname="计划结束日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
         </div>
     </EF:EFRegion>
 
@@ -47,24 +48,24 @@
             <EF:EFComboColumn ename="companyCode" cname="公司名称"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
-                              maxLength="16" readonly="true" width="120" required="true"
+                              maxLength="16" readonly="false" width="120" required="true"
                               align="center" filter="contains" sort="true">
                 <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFComboColumn ename="groupCode" cname="设备区域"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
-                              maxLength="16" readonly="true" width="120" required="true"
+                              maxLength="16" readonly="false" width="120" required="true"
                               align="center" filter="contains" sort="true">
                 <EF:EFOptions blockId="group_record_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
-            <EF:EFColumn ename="planDate" cname="计划日期" width="100" enable="true" readonly="true" align="center" editType="date"
+            <EF:EFColumn ename="planDate" cname="计划日期" width="100" enable="true" readonly="false" align="center" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
             <EF:EFColumn ename="planCode" cname="计划单号" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFComboColumn ename="planType" cname="计划类型"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
-                              maxLength="16" width="100" readonly="true" required="true"
+                              maxLength="16" width="100" readonly="false" required="true"
                               align="center" filter="contains" sort="true">
                 <EF:EFCodeOption codeName="hggp.hgsb.planType" />
             </EF:EFComboColumn>
@@ -79,7 +80,7 @@
                               align="center" filter="contains" sort="true">
                 <EF:EFOptions blockId="user_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
-            <EF:EFComboColumn ename="planStatus" cname="审批状态" width="80" align="center" readonly="false" required="true" defaultValue="0">
+            <EF:EFComboColumn ename="planStatus" cname="审批状态" width="80" align="center" enable="false" required="true" defaultValue="0">
                 <EF:EFCodeOption codeName="hggp.hgsb.approveStatus"/>
             </EF:EFComboColumn>
             <EF:EFColumn cname="创建人" ename="createdName" align="center" width="100" readonly="true" required="false"

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

@@ -201,6 +201,7 @@ let save = function (btnNode) {
         let deviceCode= item.get("deviceCode");
         let checkItem= item.get("checkItem");
         let applyUserId= item.get("applyUserId");
+        let status= item.get("status");
         if(isBlank(companyCode)){
             message("选中的第"+(index+1)+"行\"公司\"，不能为空!");
             flag = false;
@@ -226,6 +227,11 @@ let save = function (btnNode) {
             flag = false;
             return false;
         }
+        if(status == 1){
+            message("选中的第"+(index+1)+"行\"审批完成\"，不能修改!");
+            flag = false;
+            return false;
+        }
     });
     if(flag) {
         JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
@@ -238,25 +244,29 @@ let save = function (btnNode) {
 }
 
 function updateStatus(id,deviceStatus) {
-    let inEiInfo = new EiInfo();
-    inEiInfo.set("result-0-id", id);
-    inEiInfo.set("result-0-status", deviceStatus);
-    EiCommunicator.send('HGSB003', 'updateStatus', inEiInfo, {
-            onSuccess(ei) {
-                if (ei.status == "-1") {
-                    NotificationUtil({msg: ei.msg, detailMsg: ei.detailMsg}, "error");
-                } else {
-                    NotificationUtil(ei.msg);
-                    query();
+    JSUtils.confirm("确定是否\"审批完成\"操作? ", {
+        ok: function () {
+            let inEiInfo = new EiInfo();
+            inEiInfo.set("result-0-id", id);
+            inEiInfo.set("result-0-status", deviceStatus);
+            EiCommunicator.send('HGSB003', 'updateStatus', inEiInfo, {
+                    onSuccess(ei) {
+                        if (ei.status == "-1") {
+                            NotificationUtil({msg: ei.msg, detailMsg: ei.detailMsg}, "error");
+                        } else {
+                            NotificationUtil(ei.msg);
+                            query();
+                        }
+                    },
+                    onFail(errorMessage, status, e) {
+                        NotificationUtil("执行失败！", "error");
+                    }
+                }, {
+                    async: false
                 }
-            },
-            onFail(errorMessage, status, e) {
-                NotificationUtil("执行失败！", "error");
-            }
-        }, {
-            async: false
+            );
         }
-    );
+    });
 }
 
 /**

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

@@ -16,7 +16,7 @@
 <c:set var="ctx" value="${pageContext.request.contextPath}"/>
 <c:set var="loginName" value="<%=loginName%>" />
 
-<EF:EFPage  title="设备维修申请">
+<EF:EFPage  title="维保申请">
     <EF:EFRegion id="inqu" title="查询条件">
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
@@ -40,17 +40,17 @@
             <EF:EFComboColumn ename="companyCode" cname="公司名称"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
-                              maxLength="16" readonly="true" width="120" required="true"
+                              maxLength="16" readonly="false" width="120" required="true"
                               align="center" filter="contains" sort="true">
                 <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
-            <EF:EFColumn ename="applyDate" cname="申请日期" width="120" enable="true" readonly="true" align="center" editType="date"
+            <EF:EFColumn ename="applyDate" cname="申请日期" width="120" enable="true" readonly="false" align="center" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
             <EF:EFColumn ename="applyCode" cname="申请单号" width="100" enable="false" readonly="true" align="center"/>
             <EF:EFComboColumn ename="deviceCode" cname="设备名称"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
-                              maxLength="16" readonly="true" width="120" required="true"
+                              maxLength="16" readonly="false" width="120" required="true"
                               align="center" filter="contains" sort="true">
                 <EF:EFOptions blockId="deviceCodeBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
@@ -63,7 +63,7 @@
                               align="center" filter="contains" sort="true">
                 <EF:EFOptions blockId="user_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
-            <EF:EFComboColumn ename="status" cname="审批状态" width="80" align="center" readonly="false" required="true" defaultValue="0">
+            <EF:EFComboColumn ename="status" cname="审批状态" width="80" align="center" enable="false" required="true" defaultValue="0">
                 <EF:EFCodeOption codeName="hggp.hgsb.approveStatus"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="docId" cname="维修图片" width="100" enable="false" readonly="true" align="center"/>

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

@@ -37,8 +37,8 @@ $(function () {
                             if (auditStatus == 0) {
                                 template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
                                     'onclick="updateStatus(' + item.id + ',1)" >审批完成</a>';
-                                template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
-                                    'onclick="updateStatus(' + item.id + ',-1)" >审批未通过</a>';
+                                /*template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
+                                    'onclick="updateStatus(' + item.id + ',-1)" >审批未通过</a>';*/
                             }
                             if (auditStatus == -1){
                                 template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
@@ -207,6 +207,7 @@ let save = function (btnNode) {
         let planStartDate= item.get("planStartDate");
         let planEndDate= item.get("planEndDate");
         let inspecUserId= item.get("inspecUserId");
+        let checkStatus = item.get("checkStatus");
         if(isBlank(companyCode)){
             message("选中的第"+(index+1)+"行\"公司\"，不能为空!");
             flag = false;
@@ -232,6 +233,11 @@ let save = function (btnNode) {
             flag = false;
             return false;
         }
+        if(checkStatus ==1){
+            message("选中的第"+(index+1)+"行\"审核完成\"，不能修改!");
+            flag = false;
+            return false;
+        }
     });
     if(flag) {
         JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
@@ -244,22 +250,25 @@ let save = function (btnNode) {
 }
 
 function updateStatus(id,deviceStatus) {
-    let inEiInfo = new EiInfo();
-    inEiInfo.set("result-0-id", id);
-    inEiInfo.set("result-0-checkStatus", deviceStatus);
-    EiCommunicator.send('HGSB004', 'updateStatus', inEiInfo, {
-            onSuccess(response) {
-                NotificationUtil(response.msg);
-                query();
-            },
-            onFail(errorMessage, status, e) {
-                NotificationUtil("执行失败！", "error");
-            }
-        }, {
-            async: false
+    JSUtils.confirm("确定是否\"审批完成\"操作? ", {
+        ok: function () {
+            let inEiInfo = new EiInfo();
+            inEiInfo.set("result-0-id", id);
+            inEiInfo.set("result-0-checkStatus", deviceStatus);
+            EiCommunicator.send('HGSB004', 'updateStatus', inEiInfo, {
+                    onSuccess(response) {
+                        NotificationUtil(response.msg);
+                        query();
+                    },
+                    onFail(errorMessage, status, e) {
+                        NotificationUtil("执行失败！", "error");
+                    }
+                }, {
+                    async: false
+                }
+            );
         }
-    );
-
+    })
 
 }
 

src/main/webapp/HG/SB/HGSB004.jsp

@@ -59,7 +59,7 @@
                               align="center" filter="contains" sort="true">
                 <EF:EFOptions blockId="user_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
-            <EF:EFComboColumn ename="checkStatus" cname="审核状态" width="80" align="center" readonly="false" required="true" defaultValue="1">
+            <EF:EFComboColumn ename="checkStatus" cname="审核状态" width="80" align="center" enable="false" readonly="false" required="true" defaultValue="1">
                 <EF:EFCodeOption codeName="hggp.hgsb.approveStatus"/>
             </EF:EFComboColumn>
             <%--<EF:EFColumn cname="创建人" ename="createdName" align="center" width="100" readonly="true" required="false"

src/main/webapp/HG/SB/HGSB004B.jsp

@@ -58,7 +58,7 @@
             </EF:EFComboColumn>
             <EF:EFColumn ename="planDate" cname="计划日期" width="120" enable="true" readonly="true" align="center" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
-            <EF:EFColumn ename="planCode" cname="计划单号" width="100" enable="false" readonly="true" align="center" required="true"/>
+            <EF:EFColumn ename="planCode" cname="计划单号" width="140" enable="false" readonly="true" align="center" required="true"/>
             <EF:EFComboColumn ename="planType" cname="计划类型"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"

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

@@ -37,8 +37,8 @@ $(function () {
                             if (auditStatus == 0) {
                                 template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
                                     'onclick="updateStatus(' + item.id + ',1)" >审批完成</a>';
-                                template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
-                                    'onclick="updateStatus(' + item.id + ',-1)" >审批未通过</a>';
+                                /*template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
+                                    'onclick="updateStatus(' + item.id + ',-1)" >审批未通过</a>';*/
                             }
                             if (auditStatus == -1){
                                 template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
@@ -207,6 +207,7 @@ let save = function (btnNode) {
         let planStartDate= item.get("planStartDate");
         let planEndDate= item.get("planEndDate");
         let upkeepUserId= item.get("upkeepUserId");
+        let checkStatus= item.get("checkStatus");
         if(isBlank(companyCode)){
             message("选中的第"+(index+1)+"行\"公司\"，不能为空!");
             flag = false;
@@ -232,6 +233,11 @@ let save = function (btnNode) {
             flag = false;
             return false;
         }
+        if(checkStatus == 1){
+            message("选中的第"+(index+1)+"行\"审核完成\"，不能修改!");
+            flag = false;
+            return false;
+        }
     });
     if(flag) {
         JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
@@ -244,22 +250,25 @@ let save = function (btnNode) {
 }
 
 function updateStatus(id,deviceStatus) {
-    let inEiInfo = new EiInfo();
-    inEiInfo.set("result-0-id", id);
-    inEiInfo.set("result-0-checkStatus", deviceStatus);
-    EiCommunicator.send('HGSB005', 'updateStatus', inEiInfo, {
-            onSuccess(response) {
-                NotificationUtil(response.msg);
-                query();
-            },
-            onFail(errorMessage, status, e) {
-                NotificationUtil("执行失败！", "error");
-            }
-        }, {
-            async: false
+    JSUtils.confirm("确定是否\"审批完成\"操作? ", {
+        ok: function () {
+            let inEiInfo = new EiInfo();
+            inEiInfo.set("result-0-id", id);
+            inEiInfo.set("result-0-checkStatus", deviceStatus);
+            EiCommunicator.send('HGSB005', 'updateStatus', inEiInfo, {
+                    onSuccess(response) {
+                        NotificationUtil(response.msg);
+                        query();
+                    },
+                    onFail(errorMessage, status, e) {
+                        NotificationUtil("执行失败！", "error");
+                    }
+                }, {
+                    async: false
+                }
+            );
         }
-    );
-
+    })
 
 }
 

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

@@ -43,7 +43,7 @@
                               align="center" filter="contains" sort="true">
                 <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
-            <EF:EFColumn ename="upkeepDate" cname="保养日期" width="120" enable="true" align="center" editType="date"
+            <EF:EFColumn ename="upkeepDate" cname="保养日期" width="120" enable="true" readonly="false" align="center" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
             <EF:EFColumn ename="upkeepCode" cname="保养单号" width="100" enable="false" readonly="true" align="center" required="true"/>
             <EF:EFColumn ename="planCode" cname="计划单号" width="100" enable="false" readonly="true" align="center" required="true"/>
@@ -58,7 +58,7 @@
                               align="center" filter="contains" sort="true">
                 <EF:EFOptions blockId="user_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
-            <EF:EFComboColumn ename="checkStatus" cname="审核状态" width="80" align="center" readonly="false" required="true" defaultValue="1">
+            <EF:EFComboColumn ename="checkStatus" cname="审核状态" width="80" align="center" enable="false" required="true" defaultValue="1">
                 <EF:EFCodeOption codeName="hggp.hgsb.approveStatus"/>
             </EF:EFComboColumn>
             <%--<EF:EFColumn cname="创建人" ename="createdName" align="center" width="100" readonly="true" required="false"