稻谷登统表添加脂肪酸值列

src/main/java/com/chinaitop/agile/mapper/DataKcglKcswDefaultMapper.xml

@@ -1182,7 +1182,7 @@
             a.cph as cphm, b.sjcfbh as cf, b.sjhwbh as hw, c.enumname as lspz, d.enumname scnf,
             b.cpzsj as rq, b.xzklhjz as rksl, e.enumname lsdj, sf.sf, ccl.ccl, zjml.zjml, gwcm.gwcm, 
             hhl.hhl, zzzl.zzzl, wjzz.wjzz, yjzz.yjzz, bwslzl.bwslzl, wsl.wsl,csl.csl, bbl.bbl,syl.syl, sml.sml, 
-            hlm.hlm, szqw.szqw, substr(be.enumname,0,2) ccfs   
+            hlm.hlm, szqw.szqw, substr(be.enumname,0,2) ccfs,zfsz.zfsz   
         FROM (select * from (select *,row_number() over(partition by BizNo order by 1) rn
               from data_crkyw_rmdj_default)t1 where t1.rn = 1) a
         inner JOIN data_crkyw_cpz_default b ON a.BizNo = b.BizNo
@@ -1353,6 +1353,16 @@
             	and jyxx.unitid = #{orgId} 
 		     </if>
         ) szqw on szqw.bizno = a.bizno
+        left join(
+             select jyxx.bizno,flt.jyz as zfsz
+             from (select * from (select *,row_number() over(partition by BizNo order by 1) rn
+              from data_crkyw_jyxx_default)t1 where t1.rn = 1) jyxx
+             left join data_crkyw_jyxx_flt_001 flt on jyxx.DataID = flt.maindataid
+             where flt.zbxmc = '2c9080d37394cccc0173992177eb0055'
+			 <if test="orgId != null">
+            	and jyxx.unitid = #{orgId} 
+		     </if>
+        ) zfsz on szqw.bizno = a.bizno
         WHERE nvl(a.BizNo,'-1') != '-1' and  a.lspz = '3166'
 		<if test="orgId != null">
         	and jyxx.unitid = #{orgId} 
@@ -1376,7 +1386,7 @@
 		select rice.clbh cphm,rice.cfmc cf,rice.hwmc hw,rice.pzmc lspz,rice.scnd scnf,
 			rice.rkrq rq,rice.rksl*1000 rksl,rice.dj lsdj,rice.sf,rice.ccl,rice.zjml,
 			rice.gwcm,rice.hhl,rice.zzzl,rice.wjzz,rice.yjzz,rice.bwslzl,rice.wsl,rice.csl,rice.bbl,
-			rice.syl,rice.sml,rice.hlm,rice.szqw,rice.ccfs
+			rice.syl,rice.sml,rice.hlm,rice.szqw,rice.ccfs,'' zfsz
 		from depot:record_rice_info rice
 		left join depot:basic_storehouse storehouse on storehouse.org_id = rice.org_id and storehouse.del_flag = 1
 			 and storehouse.library_type = 0 and storehouse.storehouse_name = rice.cfmc

src/main/java/com/chinaitop/agile/service/impl/RegistrationServiceImpl.java

@@ -583,7 +583,7 @@ public class RegistrationServiceImpl implements RegistrationService{
 			hssfCell15.setCellValue((String)list.get(i).get("hhl"));
 			hssfCell16.setCellValue((String)list.get(i).get("szqw"));
 			hssfCell18.setCellValue((String)list.get(i).get("ccfs"));
-			hssfCell17.setCellValue((String)list.get(i).get("zbxmc"));
+			hssfCell17.setCellValue((String)list.get(i).get("zfsz"));
 			hssfCell1.setCellStyle(contentStyle);
 			hssfCell2.setCellStyle(contentStyle);
 			hssfCell3.setCellStyle(contentStyle);

src/main/resources/bootstrap.yml

@@ -1,33 +1,26 @@
-spring:
-  profiles:
-    active: prop
-
 server:
   port: 9026
   tomcat:
     uri-encoding: utf-8
 
----
 # 注册中心配置
 eureka:
   client:
     service-url:
       defaultZone: http://localhost:9001/eureka/
-    register-with-eureka: false
-    fetchRegistry: false
   instance:
-    prefer-ip-address: true
+    #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:9026/swagger-ui.html
+    status-page-url: http://localhost:9026/swagger-ui.html
 
 mybatis:
   config-location: classpath:mybatis/mybatis-config.xml
 
 spring:
-  profiles: local
+  #profiles: local
   application:
     name: depot-agile
   # 数据库配置
@@ -38,6 +31,10 @@ spring:
     url: jdbc:gbasedbt-sqli://101.36.160.140:19089/lsreport_ts: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/lsreport_ts:INFORMIXSERVER=gbaseserver;NEWCODESET=GBK,8859-1,819;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
+    #username: gbasedbt
+    #password: GBase123
 
   # 缓存配置
   session:
@@ -67,64 +64,3 @@ spring:
 
 web:
   upload-path: /home/depot/depot-web/apache-tomcat-8.0.53/webapps/ROOT/WEB-INF/classes/static
-
----
-# 注册中心配置
-eureka:
-  client:
-    service-url:
-      defaultZone: http://localhost:9001/eureka/
-    register-with-eureka: false
-    fetchRegistry: false
-  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:9026/swagger-ui.html
-
-mybatis:
-  config-location: classpath:mybatis/mybatis-config.xml
-
-spring:
-  profiles: prop
-  application:
-    name: depot-agile
-  # 数据库配置
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    driver-class-name: com.gbasedbt.jdbc.IfxDriver
-    #政务云数据库
-    url: jdbc:gbasedbt-sqli://111.164.113.172:666/lsreport_ts:INFORMIXSERVER=gbaseserver;NEWCODESET=GBK,8859-1,819;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
-    username: gbasedbt
-    password: GBase123
-
-  # 缓存配置
-  session:
-    store-type: redis
-  redis:
-    database: 3
-    host: 127.0.0.1
-    port: 6379
-    password:
-    timeout: 3000
-    jedis:
-      pool:
-        max-active: 8
-        max-wait: -1
-        max-idle: 8
-        min-idle: 0
-  jackson:
-    date-format: yyyy-MM-dd
-    time-zone: GMT+8
-  servlet:
-    multipart:
-      max-file-size: 10Mb
-      max-request-size: 10Mb
-  # 静态资源配置
-  resources:
-    static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${web.upload-path}
-
-web:
-  upload-path: /home/depot/depot-web/apache-tomcat-8.0.53/webapps/ROOT/WEB-INF/classes/static