Merge branch 'dev' of http://git.pseer.com:8800/platform/hp-smart into dev-ly

src/main/java/com/baosight/hpjx/hp/zl/sql/HPZL004C.xml

@@ -20,6 +20,7 @@
     </sql>
 
     <sql id="condition">
+        AND DELETE_FLAG = 0
 		<isNotEmpty prepend=" AND " property="id">
 			ID = #id#
 		</isNotEmpty>

src/main/resources/quartz.properties

-#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02B1\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u03BB\uFFFD\uFFFD\uFFFD\uFFFD
 xservices.job.startupDelay=60
 
 org.quartz.scheduler.instanceName = iPlat4j_Scheduler
@@ -7,23 +6,17 @@ org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
 org.quartz.threadPool.threadCount = 20
 org.quartz.threadPool.threadPriority = 5
 org.quartz.jobStore.misfireThreshold = 60000
-#\uFFFD\u06B4\u6DFD\u02BD
 #org.quartz.jobStore.class = org.quartz.simpl.RAMJobStore
 
-
-#\uFFFD\uFFFD\uFFFD\u077F\u2DFD\u02BD\uFFFD\u05BE\u00FB\uFFFD\uFFFD\uFFFD\u02B1\uFFFD\uFFFD\uFFFD\uFFFD
 org.quartz.jobStore.class = org.quartz.impl.jdbcjobstore.JobStoreTX
 org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.StdJDBCDelegate
 org.quartz.jobStore.useProperties = false
 org.quartz.jobStore.dataSource = appDS
 org.quartz.jobStore.tablePrefix = EJ_QRTZ_
-#\uFFFD\uFFFD\u023A\u0123\u02BD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u03AAtrue
 org.quartz.jobStore.isClustered = true
 
-##JNDI\uFFFD\uFFFD\uFFFD\u00F7\uFFFD\u02BD
 #org.quartz.dataSource.appDS.jndiURL=appDS
 
-#\uFFFD\u02F4\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u077F\uFFFD\u05BE\u00FB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u077F\uFFFD\uFFFD\uFFFD\u0635\uFFFD\uFFFD\uFFFD\u03E2
 org.quartz.jobStore.clusterCheckinInterval = 20000
 org.quartz.dataSource.appDS.driver = com.mysql.cj.jdbc.Driver
 org.quartz.dataSource.appDS.URL = jdbc:mysql://129.211.46.84:3306/iplat_hpjx?useSSL=false&useUnicode=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true
@@ -34,7 +27,6 @@ org.quartz.dataSource.appDS.password =Whxz@2019
 #org.quartz.dataSource.appDS.password =123456
 org.quartz.dataSource.appDS.maxConnections = 30
 
-#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05B1\uFFFD\uFFFD\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\u00BC\uFFFD\uFFFD\uFFFD
 org.quartz.plugin.logging.class = com.baosight.xservices.ej.job.quartz.JobLoggingPluginWithPartition
 org.quartz.plugin.logging.tablePrefix = EJ_QRTZ_
 

src/main/webapp/HP/ZL/HPZL004.jsp

@@ -40,8 +40,8 @@
 			<EF:EFColumn ename="qualityProblem" cname="质量问题描述" enable="false" width="130" align="center"/>
 			<EF:EFColumn ename="processSugges" cname="处理意见" enable="false" width="130" align="center"/>
 			<EF:EFColumn ename="rectifySugges" cname="整改措施" enable="false" width="130" align="center"/>
-			<EF:EFColumn ename="responDepName" cname="责任部门" enable="false" width="130" align="left"/>
-			<EF:EFColumn ename="responUserName" cname="责任人" enable="false" width="130" align="left"/>
+			<EF:EFColumn ename="responDepName" cname="责任部门" enable="false" width="130" align="center"/>
+			<EF:EFColumn ename="responUserName" cname="责任人" enable="false" width="130" align="center"/>
 			<EF:EFColumn ename="checkName" cname="质检人" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="checkTime" cname="质检时间" enable="false" width="140" align="center" editType="datetime"
 			             dateFormat="yyyy-MM-dd HH:mm:ss" parseFormats="['yyyyMMddHHmmss']" readOnly="true"/>