粮情卡功能bug修改

src/main/java/com/chinaitop/depot/storage/controller/StorageWarterCheckController.java

@@ -204,6 +204,7 @@ public class StorageWarterCheckController {
 		Integer orgId = (Integer) request.getSession().getAttribute("orgId");
 		StorageWaterCheckExample example = new StorageWaterCheckExample();
 		StorageWaterCheckExample.Criteria criteria = example.createCriteria();
+		example.setOrderByClause(" hy_date desc");
 
 		if (null != pageNum && null != pageSize) {
 			PageHelper.startPage(pageNum, pageSize);

src/main/java/com/chinaitop/depot/storage/mapper/StorageQualitycheckInspectionMapper.xml

@@ -968,7 +968,9 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckInspection" >
     update storage_qualitycheck_inspection
     <set >
-
+      <if test="qualitycheckId != null">
+        qualitycheck_id = #{qualitycheckId,jdbcType=INTEGER},
+      </if>
       <if test="unitWeight != null" >
         unit_weight = #{unitWeight,jdbcType=VARCHAR},
       </if>
@@ -1177,7 +1179,7 @@
         imperfectgrains_scab_qtbl = #{imperfectgrainsScabQtbl,jdbcType=VARCHAR},
       </if>
     </set>
-    where qualitycheck_id = #{qualitycheckId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckInspection" >
     update storage_qualitycheck_inspection

src/main/java/com/chinaitop/depot/storage/model/StorageQualitycheck.java

@@ -45,7 +45,7 @@ public class StorageQualitycheck {
 
     private Integer subTypeDetailed;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date checkTime;//检验日期
 
     private String checkResult;//检验结果0:合格  1：不合格

src/main/java/com/chinaitop/depot/storage/service/impl/StorageQualitycheckServiceImpl.java

@@ -76,7 +76,6 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
                 //修改质检
                 if(null != qualitycheckInspectionJson && !qualitycheckInspectionJson.equals("null") && !qualitycheckInspectionJson.equals("")){
                     StorageQualitycheckInspection qualityInspection = (StorageQualitycheckInspection)mapper.readValue(qualitycheckInspectionJson, StorageQualitycheckInspection.class);
-                    System.out.println(qualityInspection.getUnitWeight());
                     qualityCheckId = qualitycheck.getId();
                     qualityInspection.setQualitycheckId(qualityCheckId);
                     if(ParameterUtil.isnull(qualityInspection.getId())){

src/main/resources/bootstrap.yml

@@ -7,13 +7,14 @@ server:
 eureka:
   client:
     service-url:
-      defaultZone: http://172.16.0.4:9711/eureka/
+      defaultZone: http://localhost:9001/eureka/
   instance:
     prefer-ip-address: true
     # 每隔10s发送一次心跳(默认30s)
     lease-renewal-interval-in-seconds: 10
     # 告知服务端30秒还未收到心跳的话，就将该服务移除列表(默认90s)
     lease-expiration-duration-in-seconds: 30
+    status-page-url: http://172.16.0.16:9010/swagger-ui.html
 
 mybatis:
   config-location: classpath:mybatis/mybatis-config.xml
@@ -24,21 +25,21 @@ spring:
   # 数据库配置
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
-    url: jdbc:gbasedbt-sqli://101.36.160.140:19089/depot:INFORMIXSERVER=ol_gbasedbt1210;NEWCODESET=GB18030,GB18030-2000,5488;DB_LOCALE=zh_cn.GB18030-2000;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
+    url: jdbc:gbasedbt-sqli://101.36.160.140:19089/depot:INFORMIXSERVER=gbaseserver;NEWCODESET=GB18030,GB18030-2000,5488;DB_LOCALE=zh_cn.GB18030-2000;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
     username: gbasedbt
     password: cDbK2S0go8
-#    url: jdbc:gbasedbt-sqli://111.164.113.172:666/depot:INFORMIXSERVER=gbaseserver;NEWCODESET=GBK,8859-1,819;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
-#    username: gbasedbt
-#    password: GBase123
+    #url: jdbc:gbasedbt-sqli://111.164.113.172:666/depot:INFORMIXSERVER=gbaseserver;NEWCODESET=GBK,8859-1,819;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
+    #username: gbasedbt
+    #password: GBase123
     driver-class-name: com.gbasedbt.jdbc.IfxDriver
 
   # 缓存配置
   session:
     store-type: redis
   redis:
-    database: 4
-    host: 172.16.0.46
-    port: 6679
+    database: 3
+    host: 172.16.0.2
+    port: 6379
     password: 123456
     timeout: 3000
     jedis:
@@ -50,9 +51,9 @@ spring:
   # 静态资源配置
   resources:
     static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${web.upload-path}
-  jackson:
-    date-format: yyyy-MM-dd
-    time-zone: GMT+8
+#  jackson:
+#    date-format: yyyy-MM-dd
+#    time-zone: GMT+8
  
 web:
   upload-path: /home/depot/depot-web/apache-tomcat-8.0.53/webapps/ROOT/WEB-INF/classes/static

src/main/resources/generatorConfig.xml

@@ -14,9 +14,9 @@
 		<!--数据库连接的信息：驱动类、连接地址、用户名、密码 -->
 		<jdbcConnection 
 			driverClass="com.gbasedbt.jdbc.IfxDriver"
-			connectionURL="jdbc:gbasedbt-sqli://101.36.160.140:19089/depot:INFORMIXSERVER=ol_gbasedbt1210;NEWCODESET=GB18030,GB18030-2000,5488;DB_LOCALE=zh_cn.GB18030-2000;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;" 
+			connectionURL="jdbc:gbasedbt-sqli://111.164.113.172:666/depot:INFORMIXSERVER=gbaseserver;NEWCODESET=GBK,8859-1,819;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;"
 			userId="gbasedbt"
-			password="cDbK2S0go8">
+			password="GBase123">
 		</jdbcConnection>
 		
 		<!-- 默认false，把JDBC DECIMAL 和 NUMERIC 类型解析为 Integer，为 true时把JDBC DECIMAL 和 
@@ -26,7 +26,7 @@
 		</javaTypeResolver>
 
 		<!-- targetProject:生成PO类的位置 -->
-		<javaModelGenerator targetPackage="com.chinaitop.depot.storage.model"
+		<javaModelGenerator targetPackage="com.chinaitop.depot.storages.model"
 			targetProject=".\src\main\java">
 			<!-- enableSubPackages:是否让schema作为包的后缀 -->
 			<property name="enableSubPackages" value="false" />
@@ -35,7 +35,7 @@
 		</javaModelGenerator>
 		
         <!-- targetProject:mapper映射文件生成的位置 -->
-		<sqlMapGenerator targetPackage="com.chinaitop.depot.storage.mapper" 
+		<sqlMapGenerator targetPackage="com.chinaitop.depot.storages.mapper"
 			targetProject=".\src\main\java">
 			<!-- enableSubPackages:是否让schema作为包的后缀 -->
 			<property name="enableSubPackages" value="false" />
@@ -43,7 +43,7 @@
 		
 		<!-- targetPackage：mapper接口生成的位置 -->
 		<javaClientGenerator type="XMLMAPPER"
-			targetPackage="com.chinaitop.depot.storage.mapper" 
+			targetPackage="com.chinaitop.depot.storages.mapper"
 			targetProject=".\src\main\java">
 			<!-- enableSubPackages:是否让schema作为包的后缀 -->
 			<property name="enableSubPackages" value="false" />
@@ -51,7 +51,7 @@
 		
 		<!-- 指定要反向生成的数据库表 -->
 <!-- 		<table schema="" tableName="storage_qualitystandard_main"></table> -->
-		<table schema="" tableName="storage_qualitystandard_preparation"></table>
+		<table schema="" tableName="t_ventilation_operation"></table>
 
 	</context>
 </generatorConfiguration>