质量标准配置开发

src/main/java/com/chinaitop/DepotQualitycheckApplication.java

@@ -6,6 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import com.github.pagehelper.autoconfigure.PageHelperAutoConfiguration;
 
@@ -13,6 +14,7 @@ import com.github.pagehelper.autoconfigure.PageHelperAutoConfiguration;
 @EnableEurekaClient
 @EnableFeignClients
 @EnableDiscoveryClient
+@EnableTransactionManagement
 @SpringBootApplication(exclude = PageHelperAutoConfiguration.class)//配置mybatis的配置文件使用，否则报多个分页插件
 @MapperScan(basePackages = {"com.chinaitop.depot.*.mapper"})
 public class DepotQualitycheckApplication {

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

@@ -0,0 +1,139 @@
+package com.chinaitop.depot.storage.controller;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.chinaitop.depot.storage.model.StorageQualitystandardMain;
+import com.chinaitop.depot.storage.service.StorageQualitystandardMainService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+@RestController
+@RequestMapping(value="StorageQualitystandardMainController")
+@Api(value= "StorageQualitystandardMainController", description = "质量标准配置控制类")
+public class StorageQualitystandardMainController {
+
+	@Autowired
+	private StorageQualitystandardMainService storageQualitystandardMainService;
+
+	@RequestMapping(value = "/getList",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+    @ApiOperation(value="质量标准配置数据列表", notes = "支持分页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+            @ApiImplicitParam(name = "lspz", value = "粮食品种ID", paramType = "query")
+    })
+	public PageInfo<StorageQualitystandardMain> getList(HttpServletRequest request, Integer pageNum, Integer pageSize, Integer lspz) {
+		PageInfo<StorageQualitystandardMain> pageInfo = null;
+		try {
+			if (null != pageNum && null != pageSize) {
+				PageHelper.startPage(pageNum, pageSize);
+			}
+			List<StorageQualitystandardMain> list = storageQualitystandardMainService.getList(request, lspz);
+			pageInfo = new PageInfo<StorageQualitystandardMain>(list);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return pageInfo;
+	}
+
+	@RequestMapping(value = "/findByIdObj",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+    @ApiOperation(value="查询一条质量标准配置数据", notes = "")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "id", value = "数据ID", paramType = "query")
+    })
+	public Map<String, Object> findByIdObj(String id) {
+		Map<String, Object> map = new HashMap<String, Object>();
+
+		try {
+			map = storageQualitystandardMainService.findByIdObj(id);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		return map;
+	}
+
+	@RequestMapping(value = "/initObj",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+    @ApiOperation(value="初始化品种化验项数据", notes = "")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "lspz", value = "粮油品种", paramType = "query")
+    })
+	public Map<String, Object> initObj(Integer lspz) {
+		Map<String, Object> map = null;
+		try {
+			map = storageQualitystandardMainService.initObj(lspz);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return map;
+	}
+
+	@RequestMapping(value = "/saveOrUpdate",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.POST)
+    @ApiOperation(value="保存或更新一条质量标准配置数据", notes = "")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "obj_main", value = "主表数据", paramType = "form"),
+        @ApiImplicitParam(name = "obj", value = "子表数据", paramType = "form")
+    })
+	public Map<String, Object> saveOrUpdate(HttpServletRequest request, String obj_main, String obj) {
+		Map<String, Object> map = new HashMap<String, Object>();
+
+		try {
+			storageQualitystandardMainService.saveOrUpdate(request, obj_main, obj);
+			map.put("status", "200");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		return map;
+	}
+
+	@RequestMapping(value = "/delete",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.POST)
+    @ApiOperation(value="删除一条质量标准配置数据", notes = "")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "id", value = "数据ID", paramType = "form")
+    })
+	public Map<String, Object> delete(String id) {
+		Map<String, Object> map = new HashMap<String, Object>();
+
+		try {
+			storageQualitystandardMainService.delete(id);
+			map.put("status", "200");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		return map;
+	}
+
+	@RequestMapping(value = "/findLspzObjs",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+    @ApiOperation(value="删除一条质量标准配置数据", notes = "")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "lspz", value = "适用品种", paramType = "query")
+    })
+	public Map<String, Object> findLspzObjs(Integer lspz) {
+		Map<String, Object> map = null;
+
+		try {
+			map = storageQualitystandardMainService.findLspzObjs(lspz);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		return map;
+	}
+}

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

@@ -1,51 +0,0 @@
-package com.chinaitop.depot.storage.controller;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.chinaitop.depot.storage.model.StorageQualitystandardPreparation;
-import com.chinaitop.depot.storage.service.StorageQualitystandardPreparationService;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-
-@RestController
-@RequestMapping(value="StorageQualitystandardPreparationController")
-@Api(value= "StorageQualitystandardPreparationController", description = "质量标准配置控制类")
-public class StorageQualitystandardPreparationController {
-
-	@Autowired
-	private StorageQualitystandardPreparationService storageQualitystandardPreparationService;
-
-	@RequestMapping(value = "/getList",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
-    @ApiOperation(value="质量标准配置数据列表", notes = "支持分页")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
-            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
-            @ApiImplicitParam(name = "lspz", value = "粮食品种ID", paramType = "query")
-    })
-	public PageInfo<StorageQualitystandardPreparation> getList(HttpServletRequest request, Integer pageNum, Integer pageSize, Integer lspz) {
-		PageInfo<StorageQualitystandardPreparation> pageInfo = null;
-		try {
-			if (null != pageNum && null != pageSize) {
-				PageHelper.startPage(pageNum, pageSize);
-			}
-			List<StorageQualitystandardPreparation> list = storageQualitystandardPreparationService.getList(request, lspz);
-			pageInfo = new PageInfo<StorageQualitystandardPreparation>(list);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return pageInfo;
-	}
-}

src/main/java/com/chinaitop/depot/storage/mapper/StorageQualitystandardMainMapper.java

@@ -0,0 +1,30 @@
+package com.chinaitop.depot.storage.mapper;
+
+import com.chinaitop.depot.storage.model.StorageQualitystandardMain;
+import com.chinaitop.depot.storage.model.StorageQualitystandardMainExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface StorageQualitystandardMainMapper {
+    int countByExample(StorageQualitystandardMainExample example);
+
+    int deleteByExample(StorageQualitystandardMainExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(StorageQualitystandardMain record);
+
+    int insertSelective(StorageQualitystandardMain record);
+
+    List<StorageQualitystandardMain> selectByExample(StorageQualitystandardMainExample example);
+
+    StorageQualitystandardMain selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") StorageQualitystandardMain record, @Param("example") StorageQualitystandardMainExample example);
+
+    int updateByExample(@Param("record") StorageQualitystandardMain record, @Param("example") StorageQualitystandardMainExample example);
+
+    int updateByPrimaryKeySelective(StorageQualitystandardMain record);
+
+    int updateByPrimaryKey(StorageQualitystandardMain record);
+}

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

@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.chinaitop.depot.storage.mapper.StorageQualitystandardMainMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.storage.model.StorageQualitystandardMain" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="standard_name" property="standardName" jdbcType="VARCHAR" />
+    <result column="sub_type" property="subType" jdbcType="INTEGER" />
+    <result column="open_not" property="openNot" jdbcType="INTEGER" />
+    <result column="creater" property="creater" jdbcType="VARCHAR" />
+    <result column="createtime" property="createtime" jdbcType="TIMESTAMP" />
+    <result column="updatetime" property="updatetime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, org_id, standard_name, sub_type, open_not, creater, createtime, updatetime
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageQualitystandardMainExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_qualitystandard_main
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from storage_qualitystandard_main
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from storage_qualitystandard_main
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.storage.model.StorageQualitystandardMainExample" >
+    delete from storage_qualitystandard_main
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.storage.model.StorageQualitystandardMain" >
+    insert into storage_qualitystandard_main (id, org_id, standard_name, 
+      sub_type, open_not, creater, 
+      createtime, updatetime)
+    values (#{id,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{standardName,jdbcType=VARCHAR}, 
+      #{subType,jdbcType=INTEGER}, #{openNot,jdbcType=INTEGER}, #{creater,jdbcType=VARCHAR}, 
+      #{createtime,jdbcType=TIMESTAMP}, #{updatetime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageQualitystandardMain" >
+    insert into storage_qualitystandard_main
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="standardName != null" >
+        standard_name,
+      </if>
+      <if test="subType != null" >
+        sub_type,
+      </if>
+      <if test="openNot != null" >
+        open_not,
+      </if>
+      <if test="creater != null" >
+        creater,
+      </if>
+      <if test="createtime != null" >
+        createtime,
+      </if>
+      <if test="updatetime != null" >
+        updatetime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="standardName != null" >
+        #{standardName,jdbcType=VARCHAR},
+      </if>
+      <if test="subType != null" >
+        #{subType,jdbcType=INTEGER},
+      </if>
+      <if test="openNot != null" >
+        #{openNot,jdbcType=INTEGER},
+      </if>
+      <if test="creater != null" >
+        #{creater,jdbcType=VARCHAR},
+      </if>
+      <if test="createtime != null" >
+        #{createtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatetime != null" >
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageQualitystandardMainExample" resultType="java.lang.Integer" >
+    select count(*) from storage_qualitystandard_main
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update storage_qualitystandard_main
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.standardName != null" >
+        standard_name = #{record.standardName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.subType != null" >
+        sub_type = #{record.subType,jdbcType=INTEGER},
+      </if>
+      <if test="record.openNot != null" >
+        open_not = #{record.openNot,jdbcType=INTEGER},
+      </if>
+      <if test="record.creater != null" >
+        creater = #{record.creater,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createtime != null" >
+        createtime = #{record.createtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatetime != null" >
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update storage_qualitystandard_main
+    set id = #{record.id,jdbcType=VARCHAR},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      standard_name = #{record.standardName,jdbcType=VARCHAR},
+      sub_type = #{record.subType,jdbcType=INTEGER},
+      open_not = #{record.openNot,jdbcType=INTEGER},
+      creater = #{record.creater,jdbcType=VARCHAR},
+      createtime = #{record.createtime,jdbcType=TIMESTAMP},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageQualitystandardMain" >
+    update storage_qualitystandard_main
+    <set >
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="standardName != null" >
+        standard_name = #{standardName,jdbcType=VARCHAR},
+      </if>
+      <if test="subType != null" >
+        sub_type = #{subType,jdbcType=INTEGER},
+      </if>
+      <if test="openNot != null" >
+        open_not = #{openNot,jdbcType=INTEGER},
+      </if>
+      <if test="creater != null" >
+        creater = #{creater,jdbcType=VARCHAR},
+      </if>
+      <if test="createtime != null" >
+        createtime = #{createtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatetime != null" >
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.StorageQualitystandardMain" >
+    update storage_qualitystandard_main
+    set org_id = #{orgId,jdbcType=INTEGER},
+      standard_name = #{standardName,jdbcType=VARCHAR},
+      sub_type = #{subType,jdbcType=INTEGER},
+      open_not = #{openNot,jdbcType=INTEGER},
+      creater = #{creater,jdbcType=VARCHAR},
+      createtime = #{createtime,jdbcType=TIMESTAMP},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

src/main/java/com/chinaitop/depot/storage/mapper/StorageQualitystandardPreparationMapper.java

@@ -1,30 +0,0 @@
-package com.chinaitop.depot.storage.mapper;
-
-import com.chinaitop.depot.storage.model.StorageQualitystandardPreparation;
-import com.chinaitop.depot.storage.model.StorageQualitystandardPreparationExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface StorageQualitystandardPreparationMapper {
-    int countByExample(StorageQualitystandardPreparationExample example);
-
-    int deleteByExample(StorageQualitystandardPreparationExample example);
-
-    int deleteByPrimaryKey(String id);
-
-    int insert(StorageQualitystandardPreparation record);
-
-    int insertSelective(StorageQualitystandardPreparation record);
-
-    List<StorageQualitystandardPreparation> selectByExample(StorageQualitystandardPreparationExample example);
-
-    StorageQualitystandardPreparation selectByPrimaryKey(String id);
-
-    int updateByExampleSelective(@Param("record") StorageQualitystandardPreparation record, @Param("example") StorageQualitystandardPreparationExample example);
-
-    int updateByExample(@Param("record") StorageQualitystandardPreparation record, @Param("example") StorageQualitystandardPreparationExample example);
-
-    int updateByPrimaryKeySelective(StorageQualitystandardPreparation record);
-
-    int updateByPrimaryKey(StorageQualitystandardPreparation record);
-}

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

@@ -1,815 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.chinaitop.depot.storage.mapper.StorageQualitystandardPreparationMapper" >
-  <resultMap id="BaseResultMap" type="com.chinaitop.depot.storage.model.StorageQualitystandardPreparation" >
-    <id column="id" property="id" jdbcType="VARCHAR" />
-    <result column="org_id" property="orgId" jdbcType="INTEGER" />
-    <result column="open_not" property="openNot" jdbcType="INTEGER" />
-    <result column="creater" property="creater" jdbcType="VARCHAR" />
-    <result column="createtime" property="createtime" jdbcType="TIMESTAMP" />
-    <result column="updatetime" property="updatetime" jdbcType="TIMESTAMP" />
-    <result column="sub_type" property="subType" jdbcType="INTEGER" />
-    <result column="sub_type_detailed" property="subTypeDetailed" jdbcType="INTEGER" />
-    <result column="standard_name" property="standardName" jdbcType="VARCHAR" />
-    <result column="level_update" property="levelUpdate" jdbcType="VARCHAR" />
-    <result column="capacity" property="capacity" jdbcType="VARCHAR" />
-    <result column="badpart" property="badpart" jdbcType="VARCHAR" />
-    <result column="impurity_total" property="impurityTotal" jdbcType="VARCHAR" />
-    <result column="mineral" property="mineral" jdbcType="VARCHAR" />
-    <result column="water" property="water" jdbcType="VARCHAR" />
-    <result column="colorsmell" property="colorsmell" jdbcType="VARCHAR" />
-    <result column="mildew_count" property="mildewCount" jdbcType="VARCHAR" />
-    <result column="goodpart" property="goodpart" jdbcType="VARCHAR" />
-    <result column="damage_ratio" property="damageRatio" jdbcType="VARCHAR" />
-    <result column="hot_damage_ratio" property="hotDamageRatio" jdbcType="VARCHAR" />
-    <result column="husked_ration" property="huskedRation" jdbcType="VARCHAR" />
-    <result column="full_good_ration" property="fullGoodRation" jdbcType="VARCHAR" />
-    <result column="yellow_part" property="yellowPart" jdbcType="VARCHAR" />
-    <result column="out_husked_ration" property="outHuskedRation" jdbcType="VARCHAR" />
-    <result column="intermixing_rate" property="intermixingRate" jdbcType="VARCHAR" />
-    <result column="brokenrice_total" property="brokenriceTotal" jdbcType="VARCHAR" />
-    <result column="brokenrice_small" property="brokenriceSmall" jdbcType="VARCHAR" />
-    <result column="machiningaccuracy" property="machiningaccuracy" jdbcType="VARCHAR" />
-    <result column="machiningaccuracy_essence" property="machiningaccuracyEssence" jdbcType="VARCHAR" />
-    <result column="machiningaccuracy_suitable" property="machiningaccuracySuitable" jdbcType="VARCHAR" />
-    <result column="impurity_inorganic" property="impurityInorganic" jdbcType="VARCHAR" />
-    <result column="ash_content" property="ashContent" jdbcType="VARCHAR" />
-    <result column="gluten" property="gluten" jdbcType="VARCHAR" />
-    <result column="silt_content" property="siltContent" jdbcType="VARCHAR" />
-    <result column="magnetic_metal" property="magneticMetal" jdbcType="VARCHAR" />
-    <result column="fat_index" property="fatIndex" jdbcType="VARCHAR" />
-    <result column="smelltaste" property="smelltaste" jdbcType="VARCHAR" />
-    <result column="acid_value" property="acidValue" jdbcType="VARCHAR" />
-    <result column="residual_solvent" property="residualSolvent" jdbcType="VARCHAR" />
-    <result column="water_volatiles" property="waterVolatiles" jdbcType="VARCHAR" />
-    <result column="insoluble_impurity" property="insolubleImpurity" jdbcType="VARCHAR" />
-    <result column="soap_content" property="soapContent" jdbcType="VARCHAR" />
-    <result column="smoke_point" property="smokePoint" jdbcType="VARCHAR" />
-  </resultMap>
-  <sql id="Example_Where_Clause" >
-    <where >
-      <foreach collection="oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue" >
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue" >
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue" >
-                  and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause" >
-    <where >
-      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue" >
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue" >
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue" >
-                  and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List" >
-    id, org_id, open_not, creater, createtime, updatetime, sub_type, sub_type_detailed, 
-    standard_name, level_update, capacity, badpart, impurity_total, mineral, water, colorsmell, 
-    mildew_count, goodpart, damage_ratio, hot_damage_ratio, husked_ration, full_good_ration, 
-    yellow_part, out_husked_ration, intermixing_rate, brokenrice_total, brokenrice_small, 
-    machiningaccuracy, machiningaccuracy_essence, machiningaccuracy_suitable, impurity_inorganic, 
-    ash_content, gluten, silt_content, magnetic_metal, fat_index, smelltaste, acid_value, 
-    residual_solvent, water_volatiles, insoluble_impurity, soap_content, smoke_point
-  </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageQualitystandardPreparationExample" >
-    select
-    <if test="distinct" >
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from storage_qualitystandard_preparation
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null" >
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select 
-    <include refid="Base_Column_List" />
-    from storage_qualitystandard_preparation
-    where id = #{id,jdbcType=VARCHAR}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
-    delete from storage_qualitystandard_preparation
-    where id = #{id,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.chinaitop.depot.storage.model.StorageQualitystandardPreparationExample" >
-    delete from storage_qualitystandard_preparation
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.chinaitop.depot.storage.model.StorageQualitystandardPreparation" >
-    insert into storage_qualitystandard_preparation (id, org_id, open_not, 
-      creater, createtime, updatetime, 
-      sub_type, sub_type_detailed, standard_name, 
-      level_update, capacity, badpart, 
-      impurity_total, mineral, water, 
-      colorsmell, mildew_count, goodpart, 
-      damage_ratio, hot_damage_ratio, husked_ration, 
-      full_good_ration, yellow_part, out_husked_ration, 
-      intermixing_rate, brokenrice_total, brokenrice_small, 
-      machiningaccuracy, machiningaccuracy_essence, 
-      machiningaccuracy_suitable, impurity_inorganic, 
-      ash_content, gluten, silt_content, 
-      magnetic_metal, fat_index, smelltaste, 
-      acid_value, residual_solvent, water_volatiles, 
-      insoluble_impurity, soap_content, smoke_point
-      )
-    values (#{id,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{openNot,jdbcType=INTEGER}, 
-      #{creater,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{updatetime,jdbcType=TIMESTAMP}, 
-      #{subType,jdbcType=INTEGER}, #{subTypeDetailed,jdbcType=INTEGER}, #{standardName,jdbcType=VARCHAR}, 
-      #{levelUpdate,jdbcType=VARCHAR}, #{capacity,jdbcType=VARCHAR}, #{badpart,jdbcType=VARCHAR}, 
-      #{impurityTotal,jdbcType=VARCHAR}, #{mineral,jdbcType=VARCHAR}, #{water,jdbcType=VARCHAR}, 
-      #{colorsmell,jdbcType=VARCHAR}, #{mildewCount,jdbcType=VARCHAR}, #{goodpart,jdbcType=VARCHAR}, 
-      #{damageRatio,jdbcType=VARCHAR}, #{hotDamageRatio,jdbcType=VARCHAR}, #{huskedRation,jdbcType=VARCHAR}, 
-      #{fullGoodRation,jdbcType=VARCHAR}, #{yellowPart,jdbcType=VARCHAR}, #{outHuskedRation,jdbcType=VARCHAR}, 
-      #{intermixingRate,jdbcType=VARCHAR}, #{brokenriceTotal,jdbcType=VARCHAR}, #{brokenriceSmall,jdbcType=VARCHAR}, 
-      #{machiningaccuracy,jdbcType=VARCHAR}, #{machiningaccuracyEssence,jdbcType=VARCHAR}, 
-      #{machiningaccuracySuitable,jdbcType=VARCHAR}, #{impurityInorganic,jdbcType=VARCHAR}, 
-      #{ashContent,jdbcType=VARCHAR}, #{gluten,jdbcType=VARCHAR}, #{siltContent,jdbcType=VARCHAR}, 
-      #{magneticMetal,jdbcType=VARCHAR}, #{fatIndex,jdbcType=VARCHAR}, #{smelltaste,jdbcType=VARCHAR}, 
-      #{acidValue,jdbcType=VARCHAR}, #{residualSolvent,jdbcType=VARCHAR}, #{waterVolatiles,jdbcType=VARCHAR}, 
-      #{insolubleImpurity,jdbcType=VARCHAR}, #{soapContent,jdbcType=VARCHAR}, #{smokePoint,jdbcType=VARCHAR}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageQualitystandardPreparation" >
-    insert into storage_qualitystandard_preparation
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="id != null" >
-        id,
-      </if>
-      <if test="orgId != null" >
-        org_id,
-      </if>
-      <if test="openNot != null" >
-        open_not,
-      </if>
-      <if test="creater != null" >
-        creater,
-      </if>
-      <if test="createtime != null" >
-        createtime,
-      </if>
-      <if test="updatetime != null" >
-        updatetime,
-      </if>
-      <if test="subType != null" >
-        sub_type,
-      </if>
-      <if test="subTypeDetailed != null" >
-        sub_type_detailed,
-      </if>
-      <if test="standardName != null" >
-        standard_name,
-      </if>
-      <if test="levelUpdate != null" >
-        level_update,
-      </if>
-      <if test="capacity != null" >
-        capacity,
-      </if>
-      <if test="badpart != null" >
-        badpart,
-      </if>
-      <if test="impurityTotal != null" >
-        impurity_total,
-      </if>
-      <if test="mineral != null" >
-        mineral,
-      </if>
-      <if test="water != null" >
-        water,
-      </if>
-      <if test="colorsmell != null" >
-        colorsmell,
-      </if>
-      <if test="mildewCount != null" >
-        mildew_count,
-      </if>
-      <if test="goodpart != null" >
-        goodpart,
-      </if>
-      <if test="damageRatio != null" >
-        damage_ratio,
-      </if>
-      <if test="hotDamageRatio != null" >
-        hot_damage_ratio,
-      </if>
-      <if test="huskedRation != null" >
-        husked_ration,
-      </if>
-      <if test="fullGoodRation != null" >
-        full_good_ration,
-      </if>
-      <if test="yellowPart != null" >
-        yellow_part,
-      </if>
-      <if test="outHuskedRation != null" >
-        out_husked_ration,
-      </if>
-      <if test="intermixingRate != null" >
-        intermixing_rate,
-      </if>
-      <if test="brokenriceTotal != null" >
-        brokenrice_total,
-      </if>
-      <if test="brokenriceSmall != null" >
-        brokenrice_small,
-      </if>
-      <if test="machiningaccuracy != null" >
-        machiningaccuracy,
-      </if>
-      <if test="machiningaccuracyEssence != null" >
-        machiningaccuracy_essence,
-      </if>
-      <if test="machiningaccuracySuitable != null" >
-        machiningaccuracy_suitable,
-      </if>
-      <if test="impurityInorganic != null" >
-        impurity_inorganic,
-      </if>
-      <if test="ashContent != null" >
-        ash_content,
-      </if>
-      <if test="gluten != null" >
-        gluten,
-      </if>
-      <if test="siltContent != null" >
-        silt_content,
-      </if>
-      <if test="magneticMetal != null" >
-        magnetic_metal,
-      </if>
-      <if test="fatIndex != null" >
-        fat_index,
-      </if>
-      <if test="smelltaste != null" >
-        smelltaste,
-      </if>
-      <if test="acidValue != null" >
-        acid_value,
-      </if>
-      <if test="residualSolvent != null" >
-        residual_solvent,
-      </if>
-      <if test="waterVolatiles != null" >
-        water_volatiles,
-      </if>
-      <if test="insolubleImpurity != null" >
-        insoluble_impurity,
-      </if>
-      <if test="soapContent != null" >
-        soap_content,
-      </if>
-      <if test="smokePoint != null" >
-        smoke_point,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="id != null" >
-        #{id,jdbcType=VARCHAR},
-      </if>
-      <if test="orgId != null" >
-        #{orgId,jdbcType=INTEGER},
-      </if>
-      <if test="openNot != null" >
-        #{openNot,jdbcType=INTEGER},
-      </if>
-      <if test="creater != null" >
-        #{creater,jdbcType=VARCHAR},
-      </if>
-      <if test="createtime != null" >
-        #{createtime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updatetime != null" >
-        #{updatetime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="subType != null" >
-        #{subType,jdbcType=INTEGER},
-      </if>
-      <if test="subTypeDetailed != null" >
-        #{subTypeDetailed,jdbcType=INTEGER},
-      </if>
-      <if test="standardName != null" >
-        #{standardName,jdbcType=VARCHAR},
-      </if>
-      <if test="levelUpdate != null" >
-        #{levelUpdate,jdbcType=VARCHAR},
-      </if>
-      <if test="capacity != null" >
-        #{capacity,jdbcType=VARCHAR},
-      </if>
-      <if test="badpart != null" >
-        #{badpart,jdbcType=VARCHAR},
-      </if>
-      <if test="impurityTotal != null" >
-        #{impurityTotal,jdbcType=VARCHAR},
-      </if>
-      <if test="mineral != null" >
-        #{mineral,jdbcType=VARCHAR},
-      </if>
-      <if test="water != null" >
-        #{water,jdbcType=VARCHAR},
-      </if>
-      <if test="colorsmell != null" >
-        #{colorsmell,jdbcType=VARCHAR},
-      </if>
-      <if test="mildewCount != null" >
-        #{mildewCount,jdbcType=VARCHAR},
-      </if>
-      <if test="goodpart != null" >
-        #{goodpart,jdbcType=VARCHAR},
-      </if>
-      <if test="damageRatio != null" >
-        #{damageRatio,jdbcType=VARCHAR},
-      </if>
-      <if test="hotDamageRatio != null" >
-        #{hotDamageRatio,jdbcType=VARCHAR},
-      </if>
-      <if test="huskedRation != null" >
-        #{huskedRation,jdbcType=VARCHAR},
-      </if>
-      <if test="fullGoodRation != null" >
-        #{fullGoodRation,jdbcType=VARCHAR},
-      </if>
-      <if test="yellowPart != null" >
-        #{yellowPart,jdbcType=VARCHAR},
-      </if>
-      <if test="outHuskedRation != null" >
-        #{outHuskedRation,jdbcType=VARCHAR},
-      </if>
-      <if test="intermixingRate != null" >
-        #{intermixingRate,jdbcType=VARCHAR},
-      </if>
-      <if test="brokenriceTotal != null" >
-        #{brokenriceTotal,jdbcType=VARCHAR},
-      </if>
-      <if test="brokenriceSmall != null" >
-        #{brokenriceSmall,jdbcType=VARCHAR},
-      </if>
-      <if test="machiningaccuracy != null" >
-        #{machiningaccuracy,jdbcType=VARCHAR},
-      </if>
-      <if test="machiningaccuracyEssence != null" >
-        #{machiningaccuracyEssence,jdbcType=VARCHAR},
-      </if>
-      <if test="machiningaccuracySuitable != null" >
-        #{machiningaccuracySuitable,jdbcType=VARCHAR},
-      </if>
-      <if test="impurityInorganic != null" >
-        #{impurityInorganic,jdbcType=VARCHAR},
-      </if>
-      <if test="ashContent != null" >
-        #{ashContent,jdbcType=VARCHAR},
-      </if>
-      <if test="gluten != null" >
-        #{gluten,jdbcType=VARCHAR},
-      </if>
-      <if test="siltContent != null" >
-        #{siltContent,jdbcType=VARCHAR},
-      </if>
-      <if test="magneticMetal != null" >
-        #{magneticMetal,jdbcType=VARCHAR},
-      </if>
-      <if test="fatIndex != null" >
-        #{fatIndex,jdbcType=VARCHAR},
-      </if>
-      <if test="smelltaste != null" >
-        #{smelltaste,jdbcType=VARCHAR},
-      </if>
-      <if test="acidValue != null" >
-        #{acidValue,jdbcType=VARCHAR},
-      </if>
-      <if test="residualSolvent != null" >
-        #{residualSolvent,jdbcType=VARCHAR},
-      </if>
-      <if test="waterVolatiles != null" >
-        #{waterVolatiles,jdbcType=VARCHAR},
-      </if>
-      <if test="insolubleImpurity != null" >
-        #{insolubleImpurity,jdbcType=VARCHAR},
-      </if>
-      <if test="soapContent != null" >
-        #{soapContent,jdbcType=VARCHAR},
-      </if>
-      <if test="smokePoint != null" >
-        #{smokePoint,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageQualitystandardPreparationExample" resultType="java.lang.Integer" >
-    select count(*) from storage_qualitystandard_preparation
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map" >
-    update storage_qualitystandard_preparation
-    <set >
-      <if test="record.id != null" >
-        id = #{record.id,jdbcType=VARCHAR},
-      </if>
-      <if test="record.orgId != null" >
-        org_id = #{record.orgId,jdbcType=INTEGER},
-      </if>
-      <if test="record.openNot != null" >
-        open_not = #{record.openNot,jdbcType=INTEGER},
-      </if>
-      <if test="record.creater != null" >
-        creater = #{record.creater,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createtime != null" >
-        createtime = #{record.createtime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.updatetime != null" >
-        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.subType != null" >
-        sub_type = #{record.subType,jdbcType=INTEGER},
-      </if>
-      <if test="record.subTypeDetailed != null" >
-        sub_type_detailed = #{record.subTypeDetailed,jdbcType=INTEGER},
-      </if>
-      <if test="record.standardName != null" >
-        standard_name = #{record.standardName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.levelUpdate != null" >
-        level_update = #{record.levelUpdate,jdbcType=VARCHAR},
-      </if>
-      <if test="record.capacity != null" >
-        capacity = #{record.capacity,jdbcType=VARCHAR},
-      </if>
-      <if test="record.badpart != null" >
-        badpart = #{record.badpart,jdbcType=VARCHAR},
-      </if>
-      <if test="record.impurityTotal != null" >
-        impurity_total = #{record.impurityTotal,jdbcType=VARCHAR},
-      </if>
-      <if test="record.mineral != null" >
-        mineral = #{record.mineral,jdbcType=VARCHAR},
-      </if>
-      <if test="record.water != null" >
-        water = #{record.water,jdbcType=VARCHAR},
-      </if>
-      <if test="record.colorsmell != null" >
-        colorsmell = #{record.colorsmell,jdbcType=VARCHAR},
-      </if>
-      <if test="record.mildewCount != null" >
-        mildew_count = #{record.mildewCount,jdbcType=VARCHAR},
-      </if>
-      <if test="record.goodpart != null" >
-        goodpart = #{record.goodpart,jdbcType=VARCHAR},
-      </if>
-      <if test="record.damageRatio != null" >
-        damage_ratio = #{record.damageRatio,jdbcType=VARCHAR},
-      </if>
-      <if test="record.hotDamageRatio != null" >
-        hot_damage_ratio = #{record.hotDamageRatio,jdbcType=VARCHAR},
-      </if>
-      <if test="record.huskedRation != null" >
-        husked_ration = #{record.huskedRation,jdbcType=VARCHAR},
-      </if>
-      <if test="record.fullGoodRation != null" >
-        full_good_ration = #{record.fullGoodRation,jdbcType=VARCHAR},
-      </if>
-      <if test="record.yellowPart != null" >
-        yellow_part = #{record.yellowPart,jdbcType=VARCHAR},
-      </if>
-      <if test="record.outHuskedRation != null" >
-        out_husked_ration = #{record.outHuskedRation,jdbcType=VARCHAR},
-      </if>
-      <if test="record.intermixingRate != null" >
-        intermixing_rate = #{record.intermixingRate,jdbcType=VARCHAR},
-      </if>
-      <if test="record.brokenriceTotal != null" >
-        brokenrice_total = #{record.brokenriceTotal,jdbcType=VARCHAR},
-      </if>
-      <if test="record.brokenriceSmall != null" >
-        brokenrice_small = #{record.brokenriceSmall,jdbcType=VARCHAR},
-      </if>
-      <if test="record.machiningaccuracy != null" >
-        machiningaccuracy = #{record.machiningaccuracy,jdbcType=VARCHAR},
-      </if>
-      <if test="record.machiningaccuracyEssence != null" >
-        machiningaccuracy_essence = #{record.machiningaccuracyEssence,jdbcType=VARCHAR},
-      </if>
-      <if test="record.machiningaccuracySuitable != null" >
-        machiningaccuracy_suitable = #{record.machiningaccuracySuitable,jdbcType=VARCHAR},
-      </if>
-      <if test="record.impurityInorganic != null" >
-        impurity_inorganic = #{record.impurityInorganic,jdbcType=VARCHAR},
-      </if>
-      <if test="record.ashContent != null" >
-        ash_content = #{record.ashContent,jdbcType=VARCHAR},
-      </if>
-      <if test="record.gluten != null" >
-        gluten = #{record.gluten,jdbcType=VARCHAR},
-      </if>
-      <if test="record.siltContent != null" >
-        silt_content = #{record.siltContent,jdbcType=VARCHAR},
-      </if>
-      <if test="record.magneticMetal != null" >
-        magnetic_metal = #{record.magneticMetal,jdbcType=VARCHAR},
-      </if>
-      <if test="record.fatIndex != null" >
-        fat_index = #{record.fatIndex,jdbcType=VARCHAR},
-      </if>
-      <if test="record.smelltaste != null" >
-        smelltaste = #{record.smelltaste,jdbcType=VARCHAR},
-      </if>
-      <if test="record.acidValue != null" >
-        acid_value = #{record.acidValue,jdbcType=VARCHAR},
-      </if>
-      <if test="record.residualSolvent != null" >
-        residual_solvent = #{record.residualSolvent,jdbcType=VARCHAR},
-      </if>
-      <if test="record.waterVolatiles != null" >
-        water_volatiles = #{record.waterVolatiles,jdbcType=VARCHAR},
-      </if>
-      <if test="record.insolubleImpurity != null" >
-        insoluble_impurity = #{record.insolubleImpurity,jdbcType=VARCHAR},
-      </if>
-      <if test="record.soapContent != null" >
-        soap_content = #{record.soapContent,jdbcType=VARCHAR},
-      </if>
-      <if test="record.smokePoint != null" >
-        smoke_point = #{record.smokePoint,jdbcType=VARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null" >
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map" >
-    update storage_qualitystandard_preparation
-    set id = #{record.id,jdbcType=VARCHAR},
-      org_id = #{record.orgId,jdbcType=INTEGER},
-      open_not = #{record.openNot,jdbcType=INTEGER},
-      creater = #{record.creater,jdbcType=VARCHAR},
-      createtime = #{record.createtime,jdbcType=TIMESTAMP},
-      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
-      sub_type = #{record.subType,jdbcType=INTEGER},
-      sub_type_detailed = #{record.subTypeDetailed,jdbcType=INTEGER},
-      standard_name = #{record.standardName,jdbcType=VARCHAR},
-      level_update = #{record.levelUpdate,jdbcType=VARCHAR},
-      capacity = #{record.capacity,jdbcType=VARCHAR},
-      badpart = #{record.badpart,jdbcType=VARCHAR},
-      impurity_total = #{record.impurityTotal,jdbcType=VARCHAR},
-      mineral = #{record.mineral,jdbcType=VARCHAR},
-      water = #{record.water,jdbcType=VARCHAR},
-      colorsmell = #{record.colorsmell,jdbcType=VARCHAR},
-      mildew_count = #{record.mildewCount,jdbcType=VARCHAR},
-      goodpart = #{record.goodpart,jdbcType=VARCHAR},
-      damage_ratio = #{record.damageRatio,jdbcType=VARCHAR},
-      hot_damage_ratio = #{record.hotDamageRatio,jdbcType=VARCHAR},
-      husked_ration = #{record.huskedRation,jdbcType=VARCHAR},
-      full_good_ration = #{record.fullGoodRation,jdbcType=VARCHAR},
-      yellow_part = #{record.yellowPart,jdbcType=VARCHAR},
-      out_husked_ration = #{record.outHuskedRation,jdbcType=VARCHAR},
-      intermixing_rate = #{record.intermixingRate,jdbcType=VARCHAR},
-      brokenrice_total = #{record.brokenriceTotal,jdbcType=VARCHAR},
-      brokenrice_small = #{record.brokenriceSmall,jdbcType=VARCHAR},
-      machiningaccuracy = #{record.machiningaccuracy,jdbcType=VARCHAR},
-      machiningaccuracy_essence = #{record.machiningaccuracyEssence,jdbcType=VARCHAR},
-      machiningaccuracy_suitable = #{record.machiningaccuracySuitable,jdbcType=VARCHAR},
-      impurity_inorganic = #{record.impurityInorganic,jdbcType=VARCHAR},
-      ash_content = #{record.ashContent,jdbcType=VARCHAR},
-      gluten = #{record.gluten,jdbcType=VARCHAR},
-      silt_content = #{record.siltContent,jdbcType=VARCHAR},
-      magnetic_metal = #{record.magneticMetal,jdbcType=VARCHAR},
-      fat_index = #{record.fatIndex,jdbcType=VARCHAR},
-      smelltaste = #{record.smelltaste,jdbcType=VARCHAR},
-      acid_value = #{record.acidValue,jdbcType=VARCHAR},
-      residual_solvent = #{record.residualSolvent,jdbcType=VARCHAR},
-      water_volatiles = #{record.waterVolatiles,jdbcType=VARCHAR},
-      insoluble_impurity = #{record.insolubleImpurity,jdbcType=VARCHAR},
-      soap_content = #{record.soapContent,jdbcType=VARCHAR},
-      smoke_point = #{record.smokePoint,jdbcType=VARCHAR}
-    <if test="_parameter != null" >
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageQualitystandardPreparation" >
-    update storage_qualitystandard_preparation
-    <set >
-      <if test="orgId != null" >
-        org_id = #{orgId,jdbcType=INTEGER},
-      </if>
-      <if test="openNot != null" >
-        open_not = #{openNot,jdbcType=INTEGER},
-      </if>
-      <if test="creater != null" >
-        creater = #{creater,jdbcType=VARCHAR},
-      </if>
-      <if test="createtime != null" >
-        createtime = #{createtime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updatetime != null" >
-        updatetime = #{updatetime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="subType != null" >
-        sub_type = #{subType,jdbcType=INTEGER},
-      </if>
-      <if test="subTypeDetailed != null" >
-        sub_type_detailed = #{subTypeDetailed,jdbcType=INTEGER},
-      </if>
-      <if test="standardName != null" >
-        standard_name = #{standardName,jdbcType=VARCHAR},
-      </if>
-      <if test="levelUpdate != null" >
-        level_update = #{levelUpdate,jdbcType=VARCHAR},
-      </if>
-      <if test="capacity != null" >
-        capacity = #{capacity,jdbcType=VARCHAR},
-      </if>
-      <if test="badpart != null" >
-        badpart = #{badpart,jdbcType=VARCHAR},
-      </if>
-      <if test="impurityTotal != null" >
-        impurity_total = #{impurityTotal,jdbcType=VARCHAR},
-      </if>
-      <if test="mineral != null" >
-        mineral = #{mineral,jdbcType=VARCHAR},
-      </if>
-      <if test="water != null" >
-        water = #{water,jdbcType=VARCHAR},
-      </if>
-      <if test="colorsmell != null" >
-        colorsmell = #{colorsmell,jdbcType=VARCHAR},
-      </if>
-      <if test="mildewCount != null" >
-        mildew_count = #{mildewCount,jdbcType=VARCHAR},
-      </if>
-      <if test="goodpart != null" >
-        goodpart = #{goodpart,jdbcType=VARCHAR},
-      </if>
-      <if test="damageRatio != null" >
-        damage_ratio = #{damageRatio,jdbcType=VARCHAR},
-      </if>
-      <if test="hotDamageRatio != null" >
-        hot_damage_ratio = #{hotDamageRatio,jdbcType=VARCHAR},
-      </if>
-      <if test="huskedRation != null" >
-        husked_ration = #{huskedRation,jdbcType=VARCHAR},
-      </if>
-      <if test="fullGoodRation != null" >
-        full_good_ration = #{fullGoodRation,jdbcType=VARCHAR},
-      </if>
-      <if test="yellowPart != null" >
-        yellow_part = #{yellowPart,jdbcType=VARCHAR},
-      </if>
-      <if test="outHuskedRation != null" >
-        out_husked_ration = #{outHuskedRation,jdbcType=VARCHAR},
-      </if>
-      <if test="intermixingRate != null" >
-        intermixing_rate = #{intermixingRate,jdbcType=VARCHAR},
-      </if>
-      <if test="brokenriceTotal != null" >
-        brokenrice_total = #{brokenriceTotal,jdbcType=VARCHAR},
-      </if>
-      <if test="brokenriceSmall != null" >
-        brokenrice_small = #{brokenriceSmall,jdbcType=VARCHAR},
-      </if>
-      <if test="machiningaccuracy != null" >
-        machiningaccuracy = #{machiningaccuracy,jdbcType=VARCHAR},
-      </if>
-      <if test="machiningaccuracyEssence != null" >
-        machiningaccuracy_essence = #{machiningaccuracyEssence,jdbcType=VARCHAR},
-      </if>
-      <if test="machiningaccuracySuitable != null" >
-        machiningaccuracy_suitable = #{machiningaccuracySuitable,jdbcType=VARCHAR},
-      </if>
-      <if test="impurityInorganic != null" >
-        impurity_inorganic = #{impurityInorganic,jdbcType=VARCHAR},
-      </if>
-      <if test="ashContent != null" >
-        ash_content = #{ashContent,jdbcType=VARCHAR},
-      </if>
-      <if test="gluten != null" >
-        gluten = #{gluten,jdbcType=VARCHAR},
-      </if>
-      <if test="siltContent != null" >
-        silt_content = #{siltContent,jdbcType=VARCHAR},
-      </if>
-      <if test="magneticMetal != null" >
-        magnetic_metal = #{magneticMetal,jdbcType=VARCHAR},
-      </if>
-      <if test="fatIndex != null" >
-        fat_index = #{fatIndex,jdbcType=VARCHAR},
-      </if>
-      <if test="smelltaste != null" >
-        smelltaste = #{smelltaste,jdbcType=VARCHAR},
-      </if>
-      <if test="acidValue != null" >
-        acid_value = #{acidValue,jdbcType=VARCHAR},
-      </if>
-      <if test="residualSolvent != null" >
-        residual_solvent = #{residualSolvent,jdbcType=VARCHAR},
-      </if>
-      <if test="waterVolatiles != null" >
-        water_volatiles = #{waterVolatiles,jdbcType=VARCHAR},
-      </if>
-      <if test="insolubleImpurity != null" >
-        insoluble_impurity = #{insolubleImpurity,jdbcType=VARCHAR},
-      </if>
-      <if test="soapContent != null" >
-        soap_content = #{soapContent,jdbcType=VARCHAR},
-      </if>
-      <if test="smokePoint != null" >
-        smoke_point = #{smokePoint,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.StorageQualitystandardPreparation" >
-    update storage_qualitystandard_preparation
-    set org_id = #{orgId,jdbcType=INTEGER},
-      open_not = #{openNot,jdbcType=INTEGER},
-      creater = #{creater,jdbcType=VARCHAR},
-      createtime = #{createtime,jdbcType=TIMESTAMP},
-      updatetime = #{updatetime,jdbcType=TIMESTAMP},
-      sub_type = #{subType,jdbcType=INTEGER},
-      sub_type_detailed = #{subTypeDetailed,jdbcType=INTEGER},
-      standard_name = #{standardName,jdbcType=VARCHAR},
-      level_update = #{levelUpdate,jdbcType=VARCHAR},
-      capacity = #{capacity,jdbcType=VARCHAR},
-      badpart = #{badpart,jdbcType=VARCHAR},
-      impurity_total = #{impurityTotal,jdbcType=VARCHAR},
-      mineral = #{mineral,jdbcType=VARCHAR},
-      water = #{water,jdbcType=VARCHAR},
-      colorsmell = #{colorsmell,jdbcType=VARCHAR},
-      mildew_count = #{mildewCount,jdbcType=VARCHAR},
-      goodpart = #{goodpart,jdbcType=VARCHAR},
-      damage_ratio = #{damageRatio,jdbcType=VARCHAR},
-      hot_damage_ratio = #{hotDamageRatio,jdbcType=VARCHAR},
-      husked_ration = #{huskedRation,jdbcType=VARCHAR},
-      full_good_ration = #{fullGoodRation,jdbcType=VARCHAR},
-      yellow_part = #{yellowPart,jdbcType=VARCHAR},
-      out_husked_ration = #{outHuskedRation,jdbcType=VARCHAR},
-      intermixing_rate = #{intermixingRate,jdbcType=VARCHAR},
-      brokenrice_total = #{brokenriceTotal,jdbcType=VARCHAR},
-      brokenrice_small = #{brokenriceSmall,jdbcType=VARCHAR},
-      machiningaccuracy = #{machiningaccuracy,jdbcType=VARCHAR},
-      machiningaccuracy_essence = #{machiningaccuracyEssence,jdbcType=VARCHAR},
-      machiningaccuracy_suitable = #{machiningaccuracySuitable,jdbcType=VARCHAR},
-      impurity_inorganic = #{impurityInorganic,jdbcType=VARCHAR},
-      ash_content = #{ashContent,jdbcType=VARCHAR},
-      gluten = #{gluten,jdbcType=VARCHAR},
-      silt_content = #{siltContent,jdbcType=VARCHAR},
-      magnetic_metal = #{magneticMetal,jdbcType=VARCHAR},
-      fat_index = #{fatIndex,jdbcType=VARCHAR},
-      smelltaste = #{smelltaste,jdbcType=VARCHAR},
-      acid_value = #{acidValue,jdbcType=VARCHAR},
-      residual_solvent = #{residualSolvent,jdbcType=VARCHAR},
-      water_volatiles = #{waterVolatiles,jdbcType=VARCHAR},
-      insoluble_impurity = #{insolubleImpurity,jdbcType=VARCHAR},
-      soap_content = #{soapContent,jdbcType=VARCHAR},
-      smoke_point = #{smokePoint,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-</mapper>

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

@@ -0,0 +1,149 @@
+package com.chinaitop.depot.storage.model;
+
+import java.util.Date;
+
+public class StorageQualitystandardMain {
+    private String id;
+
+    private Integer orgId;
+
+    private String standardName;
+
+    private Integer subType;
+
+    private Integer openNot;
+
+    private String creater;
+
+    private Date createtime;
+
+    private Date updatetime;
+
+    /**
+     * null
+     * @return id null
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * null
+     * @param id null
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * null
+     * @return org_id null
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * null
+     * @param orgId null
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * null
+     * @return standard_name null
+     */
+    public String getStandardName() {
+        return standardName;
+    }
+
+    /**
+     * null
+     * @param standardName null
+     */
+    public void setStandardName(String standardName) {
+        this.standardName = standardName == null ? null : standardName.trim();
+    }
+
+    /**
+     * null
+     * @return sub_type null
+     */
+    public Integer getSubType() {
+        return subType;
+    }
+
+    /**
+     * null
+     * @param subType null
+     */
+    public void setSubType(Integer subType) {
+        this.subType = subType;
+    }
+
+    /**
+     * null
+     * @return open_not null
+     */
+    public Integer getOpenNot() {
+        return openNot;
+    }
+
+    /**
+     * null
+     * @param openNot null
+     */
+    public void setOpenNot(Integer openNot) {
+        this.openNot = openNot;
+    }
+
+    /**
+     * null
+     * @return creater null
+     */
+    public String getCreater() {
+        return creater;
+    }
+
+    /**
+     * null
+     * @param creater null
+     */
+    public void setCreater(String creater) {
+        this.creater = creater == null ? null : creater.trim();
+    }
+
+    /**
+     * null
+     * @return createtime null
+     */
+    public Date getCreatetime() {
+        return createtime;
+    }
+
+    /**
+     * null
+     * @param createtime null
+     */
+    public void setCreatetime(Date createtime) {
+        this.createtime = createtime;
+    }
+
+    /**
+     * null
+     * @return updatetime null
+     */
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    /**
+     * null
+     * @param updatetime null
+     */
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+}

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

@@ -0,0 +1,729 @@
+package com.chinaitop.depot.storage.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class StorageQualitystandardMainExample {
+    /**
+     * storage_qualitystandard_main
+     */
+    protected String orderByClause;
+
+    /**
+     * storage_qualitystandard_main
+     */
+    protected boolean distinct;
+
+    /**
+     * storage_qualitystandard_main
+     */
+    protected List<Criteria> oredCriteria;
+
+    public StorageQualitystandardMainExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * storage_qualitystandard_main 2021-04-16
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNull() {
+            addCriterion("org_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNotNull() {
+            addCriterion("org_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdEqualTo(Integer value) {
+            addCriterion("org_id =", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotEqualTo(Integer value) {
+            addCriterion("org_id <>", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThan(Integer value) {
+            addCriterion("org_id >", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("org_id >=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThan(Integer value) {
+            addCriterion("org_id <", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThanOrEqualTo(Integer value) {
+            addCriterion("org_id <=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIn(List<Integer> values) {
+            addCriterion("org_id in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotIn(List<Integer> values) {
+            addCriterion("org_id not in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdBetween(Integer value1, Integer value2) {
+            addCriterion("org_id between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("org_id not between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandardNameIsNull() {
+            addCriterion("standard_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandardNameIsNotNull() {
+            addCriterion("standard_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandardNameEqualTo(String value) {
+            addCriterion("standard_name =", value, "standardName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandardNameNotEqualTo(String value) {
+            addCriterion("standard_name <>", value, "standardName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandardNameGreaterThan(String value) {
+            addCriterion("standard_name >", value, "standardName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandardNameGreaterThanOrEqualTo(String value) {
+            addCriterion("standard_name >=", value, "standardName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandardNameLessThan(String value) {
+            addCriterion("standard_name <", value, "standardName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandardNameLessThanOrEqualTo(String value) {
+            addCriterion("standard_name <=", value, "standardName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandardNameLike(String value) {
+            addCriterion("standard_name like", value, "standardName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandardNameNotLike(String value) {
+            addCriterion("standard_name not like", value, "standardName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandardNameIn(List<String> values) {
+            addCriterion("standard_name in", values, "standardName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandardNameNotIn(List<String> values) {
+            addCriterion("standard_name not in", values, "standardName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandardNameBetween(String value1, String value2) {
+            addCriterion("standard_name between", value1, value2, "standardName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandardNameNotBetween(String value1, String value2) {
+            addCriterion("standard_name not between", value1, value2, "standardName");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubTypeIsNull() {
+            addCriterion("sub_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubTypeIsNotNull() {
+            addCriterion("sub_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubTypeEqualTo(Integer value) {
+            addCriterion("sub_type =", value, "subType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubTypeNotEqualTo(Integer value) {
+            addCriterion("sub_type <>", value, "subType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubTypeGreaterThan(Integer value) {
+            addCriterion("sub_type >", value, "subType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("sub_type >=", value, "subType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubTypeLessThan(Integer value) {
+            addCriterion("sub_type <", value, "subType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("sub_type <=", value, "subType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubTypeIn(List<Integer> values) {
+            addCriterion("sub_type in", values, "subType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubTypeNotIn(List<Integer> values) {
+            addCriterion("sub_type not in", values, "subType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubTypeBetween(Integer value1, Integer value2) {
+            addCriterion("sub_type between", value1, value2, "subType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("sub_type not between", value1, value2, "subType");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenNotIsNull() {
+            addCriterion("open_not is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenNotIsNotNull() {
+            addCriterion("open_not is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenNotEqualTo(Integer value) {
+            addCriterion("open_not =", value, "openNot");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenNotNotEqualTo(Integer value) {
+            addCriterion("open_not <>", value, "openNot");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenNotGreaterThan(Integer value) {
+            addCriterion("open_not >", value, "openNot");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenNotGreaterThanOrEqualTo(Integer value) {
+            addCriterion("open_not >=", value, "openNot");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenNotLessThan(Integer value) {
+            addCriterion("open_not <", value, "openNot");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenNotLessThanOrEqualTo(Integer value) {
+            addCriterion("open_not <=", value, "openNot");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenNotIn(List<Integer> values) {
+            addCriterion("open_not in", values, "openNot");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenNotNotIn(List<Integer> values) {
+            addCriterion("open_not not in", values, "openNot");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenNotBetween(Integer value1, Integer value2) {
+            addCriterion("open_not between", value1, value2, "openNot");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenNotNotBetween(Integer value1, Integer value2) {
+            addCriterion("open_not not between", value1, value2, "openNot");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterIsNull() {
+            addCriterion("creater is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterIsNotNull() {
+            addCriterion("creater is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterEqualTo(String value) {
+            addCriterion("creater =", value, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterNotEqualTo(String value) {
+            addCriterion("creater <>", value, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterGreaterThan(String value) {
+            addCriterion("creater >", value, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterGreaterThanOrEqualTo(String value) {
+            addCriterion("creater >=", value, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterLessThan(String value) {
+            addCriterion("creater <", value, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterLessThanOrEqualTo(String value) {
+            addCriterion("creater <=", value, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterLike(String value) {
+            addCriterion("creater like", value, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterNotLike(String value) {
+            addCriterion("creater not like", value, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterIn(List<String> values) {
+            addCriterion("creater in", values, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterNotIn(List<String> values) {
+            addCriterion("creater not in", values, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterBetween(String value1, String value2) {
+            addCriterion("creater between", value1, value2, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterNotBetween(String value1, String value2) {
+            addCriterion("creater not between", value1, value2, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeIsNull() {
+            addCriterion("createtime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeIsNotNull() {
+            addCriterion("createtime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeEqualTo(Date value) {
+            addCriterion("createtime =", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeNotEqualTo(Date value) {
+            addCriterion("createtime <>", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeGreaterThan(Date value) {
+            addCriterion("createtime >", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("createtime >=", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeLessThan(Date value) {
+            addCriterion("createtime <", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeLessThanOrEqualTo(Date value) {
+            addCriterion("createtime <=", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeIn(List<Date> values) {
+            addCriterion("createtime in", values, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeNotIn(List<Date> values) {
+            addCriterion("createtime not in", values, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeBetween(Date value1, Date value2) {
+            addCriterion("createtime between", value1, value2, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeNotBetween(Date value1, Date value2) {
+            addCriterion("createtime not between", value1, value2, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIsNull() {
+            addCriterion("updatetime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIsNotNull() {
+            addCriterion("updatetime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeEqualTo(Date value) {
+            addCriterion("updatetime =", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotEqualTo(Date value) {
+            addCriterion("updatetime <>", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThan(Date value) {
+            addCriterion("updatetime >", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("updatetime >=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThan(Date value) {
+            addCriterion("updatetime <", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThanOrEqualTo(Date value) {
+            addCriterion("updatetime <=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIn(List<Date> values) {
+            addCriterion("updatetime in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotIn(List<Date> values) {
+            addCriterion("updatetime not in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeBetween(Date value1, Date value2) {
+            addCriterion("updatetime between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotBetween(Date value1, Date value2) {
+            addCriterion("updatetime not between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * storage_qualitystandard_main
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * storage_qualitystandard_main 2021-04-16
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -1,61 +1,51 @@
 package com.chinaitop.depot.storage.model;
 
-import java.util.Date;
+import java.math.BigDecimal;
 
 public class StorageQualitystandardPreparation {
     private String id;
 
-    private Integer orgId;
-
-    private Integer openNot;
-
-    private String creater;
-
-    private Date createtime;
-
-    private Date updatetime;
+    private String zId;
 
-    private Integer subType;
+    private Integer orgId;
 
     private Integer subTypeDetailed;
 
-    private String standardName;
-
-    private String levelUpdate;
+    private Integer levelUpdate;
 
-    private String capacity;
+    private BigDecimal capacity;
 
-    private String badpart;
+    private BigDecimal badpart;
 
-    private String impurityTotal;
+    private BigDecimal impurityTotal;
 
-    private String mineral;
+    private BigDecimal mineral;
 
-    private String water;
+    private BigDecimal water;
 
     private String colorsmell;
 
-    private String mildewCount;
+    private BigDecimal mildewCount;
 
-    private String goodpart;
+    private BigDecimal goodpart;
 
-    private String damageRatio;
+    private BigDecimal damageRatio;
 
-    private String hotDamageRatio;
+    private BigDecimal hotDamageRatio;
 
-    private String huskedRation;
+    private BigDecimal huskedRation;
 
-    private String fullGoodRation;
+    private BigDecimal fullGoodRation;
 
-    private String yellowPart;
+    private BigDecimal yellowPart;
 
-    private String outHuskedRation;
+    private BigDecimal outHuskedRation;
 
-    private String intermixingRate;
+    private BigDecimal intermixingRate;
 
-    private String brokenriceTotal;
+    private BigDecimal brokenriceTotal;
 
-    private String brokenriceSmall;
+    private BigDecimal brokenriceSmall;
 
     private String machiningaccuracy;
 
@@ -63,31 +53,33 @@ public class StorageQualitystandardPreparation {
 
     private String machiningaccuracySuitable;
 
-    private String impurityInorganic;
+    private BigDecimal impurityInorganic;
 
-    private String ashContent;
+    private BigDecimal ashContent;
 
-    private String gluten;
+    private BigDecimal gluten;
 
-    private String siltContent;
+    private BigDecimal siltContent;
 
-    private String magneticMetal;
+    private BigDecimal magneticMetal;
 
-    private String fatIndex;
+    private BigDecimal fatIndex;
 
     private String smelltaste;
 
-    private String acidValue;
+    private BigDecimal acidValue;
+
+    private BigDecimal gyhz;
 
-    private String residualSolvent;
+    private BigDecimal residualSolvent;
 
-    private String waterVolatiles;
+    private BigDecimal waterVolatiles;
 
-    private String insolubleImpurity;
+    private BigDecimal insolubleImpurity;
 
-    private String soapContent;
+    private BigDecimal soapContent;
 
-    private String smokePoint;
+    private BigDecimal smokePoint;
 
     /**
      * null
@@ -107,98 +99,34 @@ public class StorageQualitystandardPreparation {
 
     /**
      * null
-     * @return org_id null
-     */
-    public Integer getOrgId() {
-        return orgId;
-    }
-
-    /**
-     * null
-     * @param orgId null
-     */
-    public void setOrgId(Integer orgId) {
-        this.orgId = orgId;
-    }
-
-    /**
-     * null
-     * @return open_not null
-     */
-    public Integer getOpenNot() {
-        return openNot;
-    }
-
-    /**
-     * null
-     * @param openNot null
-     */
-    public void setOpenNot(Integer openNot) {
-        this.openNot = openNot;
-    }
-
-    /**
-     * null
-     * @return creater null
-     */
-    public String getCreater() {
-        return creater;
-    }
-
-    /**
-     * null
-     * @param creater null
-     */
-    public void setCreater(String creater) {
-        this.creater = creater == null ? null : creater.trim();
-    }
-
-    /**
-     * null
-     * @return createtime null
-     */
-    public Date getCreatetime() {
-        return createtime;
-    }
-
-    /**
-     * null
-     * @param createtime null
-     */
-    public void setCreatetime(Date createtime) {
-        this.createtime = createtime;
-    }
-
-    /**
-     * null
-     * @return updatetime null
+     * @return z_id null
      */
-    public Date getUpdatetime() {
-        return updatetime;
+    public String getzId() {
+        return zId;
     }
 
     /**
      * null
-     * @param updatetime null
+     * @param zId null
      */
-    public void setUpdatetime(Date updatetime) {
-        this.updatetime = updatetime;
+    public void setzId(String zId) {
+        this.zId = zId == null ? null : zId.trim();
     }
 
     /**
      * null
-     * @return sub_type null
+     * @return org_id null
      */
-    public Integer getSubType() {
-        return subType;
+    public Integer getOrgId() {
+        return orgId;
     }
 
     /**
      * null
-     * @param subType null
+     * @param orgId null
      */
-    public void setSubType(Integer subType) {
-        this.subType = subType;
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
     }
 
     /**
@@ -219,25 +147,9 @@ public class StorageQualitystandardPreparation {
 
     /**
      * null
-     * @return standard_name null
-     */
-    public String getStandardName() {
-        return standardName;
-    }
-
-    /**
-     * null
-     * @param standardName null
-     */
-    public void setStandardName(String standardName) {
-        this.standardName = standardName == null ? null : standardName.trim();
-    }
-
-    /**
-     * null
      * @return level_update null
      */
-    public String getLevelUpdate() {
+    public Integer getLevelUpdate() {
         return levelUpdate;
     }
 
@@ -245,15 +157,15 @@ public class StorageQualitystandardPreparation {
      * null
      * @param levelUpdate null
      */
-    public void setLevelUpdate(String levelUpdate) {
-        this.levelUpdate = levelUpdate == null ? null : levelUpdate.trim();
+    public void setLevelUpdate(Integer levelUpdate) {
+        this.levelUpdate = levelUpdate;
     }
 
     /**
      * null
      * @return capacity null
      */
-    public String getCapacity() {
+    public BigDecimal getCapacity() {
         return capacity;
     }
 
@@ -261,15 +173,15 @@ public class StorageQualitystandardPreparation {
      * null
      * @param capacity null
      */
-    public void setCapacity(String capacity) {
-        this.capacity = capacity == null ? null : capacity.trim();
+    public void setCapacity(BigDecimal capacity) {
+        this.capacity = capacity;
     }
 
     /**
      * null
      * @return badpart null
      */
-    public String getBadpart() {
+    public BigDecimal getBadpart() {
         return badpart;
     }
 
@@ -277,15 +189,15 @@ public class StorageQualitystandardPreparation {
      * null
      * @param badpart null
      */
-    public void setBadpart(String badpart) {
-        this.badpart = badpart == null ? null : badpart.trim();
+    public void setBadpart(BigDecimal badpart) {
+        this.badpart = badpart;
     }
 
     /**
      * null
      * @return impurity_total null
      */
-    public String getImpurityTotal() {
+    public BigDecimal getImpurityTotal() {
         return impurityTotal;
     }
 
@@ -293,15 +205,15 @@ public class StorageQualitystandardPreparation {
      * null
      * @param impurityTotal null
      */
-    public void setImpurityTotal(String impurityTotal) {
-        this.impurityTotal = impurityTotal == null ? null : impurityTotal.trim();
+    public void setImpurityTotal(BigDecimal impurityTotal) {
+        this.impurityTotal = impurityTotal;
     }
 
     /**
      * null
      * @return mineral null
      */
-    public String getMineral() {
+    public BigDecimal getMineral() {
         return mineral;
     }
 
@@ -309,15 +221,15 @@ public class StorageQualitystandardPreparation {
      * null
      * @param mineral null
      */
-    public void setMineral(String mineral) {
-        this.mineral = mineral == null ? null : mineral.trim();
+    public void setMineral(BigDecimal mineral) {
+        this.mineral = mineral;
     }
 
     /**
      * null
      * @return water null
      */
-    public String getWater() {
+    public BigDecimal getWater() {
         return water;
     }
 
@@ -325,8 +237,8 @@ public class StorageQualitystandardPreparation {
      * null
      * @param water null
      */
-    public void setWater(String water) {
-        this.water = water == null ? null : water.trim();
+    public void setWater(BigDecimal water) {
+        this.water = water;
     }
 
     /**
@@ -349,7 +261,7 @@ public class StorageQualitystandardPreparation {
      * null
      * @return mildew_count null
      */
-    public String getMildewCount() {
+    public BigDecimal getMildewCount() {
         return mildewCount;
     }
 
@@ -357,15 +269,15 @@ public class StorageQualitystandardPreparation {
      * null
      * @param mildewCount null
      */
-    public void setMildewCount(String mildewCount) {
-        this.mildewCount = mildewCount == null ? null : mildewCount.trim();
+    public void setMildewCount(BigDecimal mildewCount) {
+        this.mildewCount = mildewCount;
     }
 
     /**
      * null
      * @return goodpart null
      */
-    public String getGoodpart() {
+    public BigDecimal getGoodpart() {
         return goodpart;
     }
 
@@ -373,15 +285,15 @@ public class StorageQualitystandardPreparation {
      * null
      * @param goodpart null
      */
-    public void setGoodpart(String goodpart) {
-        this.goodpart = goodpart == null ? null : goodpart.trim();
+    public void setGoodpart(BigDecimal goodpart) {
+        this.goodpart = goodpart;
     }
 
     /**
      * null
      * @return damage_ratio null
      */
-    public String getDamageRatio() {
+    public BigDecimal getDamageRatio() {
         return damageRatio;
     }
 
@@ -389,15 +301,15 @@ public class StorageQualitystandardPreparation {
      * null
      * @param damageRatio null
      */
-    public void setDamageRatio(String damageRatio) {
-        this.damageRatio = damageRatio == null ? null : damageRatio.trim();
+    public void setDamageRatio(BigDecimal damageRatio) {
+        this.damageRatio = damageRatio;
     }
 
     /**
      * null
      * @return hot_damage_ratio null
      */
-    public String getHotDamageRatio() {
+    public BigDecimal getHotDamageRatio() {
         return hotDamageRatio;
     }
 
@@ -405,15 +317,15 @@ public class StorageQualitystandardPreparation {
      * null
      * @param hotDamageRatio null
      */
-    public void setHotDamageRatio(String hotDamageRatio) {
-        this.hotDamageRatio = hotDamageRatio == null ? null : hotDamageRatio.trim();
+    public void setHotDamageRatio(BigDecimal hotDamageRatio) {
+        this.hotDamageRatio = hotDamageRatio;
     }
 
     /**
      * null
      * @return husked_ration null
      */
-    public String getHuskedRation() {
+    public BigDecimal getHuskedRation() {
         return huskedRation;
     }
 
@@ -421,15 +333,15 @@ public class StorageQualitystandardPreparation {
      * null
      * @param huskedRation null
      */
-    public void setHuskedRation(String huskedRation) {
-        this.huskedRation = huskedRation == null ? null : huskedRation.trim();
+    public void setHuskedRation(BigDecimal huskedRation) {
+        this.huskedRation = huskedRation;
     }
 
     /**
      * null
      * @return full_good_ration null
      */
-    public String getFullGoodRation() {
+    public BigDecimal getFullGoodRation() {
         return fullGoodRation;
     }
 
@@ -437,15 +349,15 @@ public class StorageQualitystandardPreparation {
      * null
      * @param fullGoodRation null
      */
-    public void setFullGoodRation(String fullGoodRation) {
-        this.fullGoodRation = fullGoodRation == null ? null : fullGoodRation.trim();
+    public void setFullGoodRation(BigDecimal fullGoodRation) {
+        this.fullGoodRation = fullGoodRation;
     }
 
     /**
      * null
      * @return yellow_part null
      */
-    public String getYellowPart() {
+    public BigDecimal getYellowPart() {
         return yellowPart;
     }
 
@@ -453,15 +365,15 @@ public class StorageQualitystandardPreparation {
      * null
      * @param yellowPart null
      */
-    public void setYellowPart(String yellowPart) {
-        this.yellowPart = yellowPart == null ? null : yellowPart.trim();
+    public void setYellowPart(BigDecimal yellowPart) {
+        this.yellowPart = yellowPart;
     }
 
     /**
      * null
      * @return out_husked_ration null
      */
-    public String getOutHuskedRation() {
+    public BigDecimal getOutHuskedRation() {
         return outHuskedRation;
     }
 
@@ -469,15 +381,15 @@ public class StorageQualitystandardPreparation {
      * null
      * @param outHuskedRation null
      */
-    public void setOutHuskedRation(String outHuskedRation) {
-        this.outHuskedRation = outHuskedRation == null ? null : outHuskedRation.trim();
+    public void setOutHuskedRation(BigDecimal outHuskedRation) {
+        this.outHuskedRation = outHuskedRation;
     }
 
     /**
      * null
      * @return intermixing_rate null
      */
-    public String getIntermixingRate() {
+    public BigDecimal getIntermixingRate() {
         return intermixingRate;
     }
 
@@ -485,15 +397,15 @@ public class StorageQualitystandardPreparation {
      * null
      * @param intermixingRate null
      */
-    public void setIntermixingRate(String intermixingRate) {
-        this.intermixingRate = intermixingRate == null ? null : intermixingRate.trim();
+    public void setIntermixingRate(BigDecimal intermixingRate) {
+        this.intermixingRate = intermixingRate;
     }
 
     /**
      * null
      * @return brokenrice_total null
      */
-    public String getBrokenriceTotal() {
+    public BigDecimal getBrokenriceTotal() {
         return brokenriceTotal;
     }
 
@@ -501,15 +413,15 @@ public class StorageQualitystandardPreparation {
      * null
      * @param brokenriceTotal null
      */
-    public void setBrokenriceTotal(String brokenriceTotal) {
-        this.brokenriceTotal = brokenriceTotal == null ? null : brokenriceTotal.trim();
+    public void setBrokenriceTotal(BigDecimal brokenriceTotal) {
+        this.brokenriceTotal = brokenriceTotal;
     }
 
     /**
      * null
      * @return brokenrice_small null
      */
-    public String getBrokenriceSmall() {
+    public BigDecimal getBrokenriceSmall() {
         return brokenriceSmall;
     }
 
@@ -517,8 +429,8 @@ public class StorageQualitystandardPreparation {
      * null
      * @param brokenriceSmall null
      */
-    public void setBrokenriceSmall(String brokenriceSmall) {
-        this.brokenriceSmall = brokenriceSmall == null ? null : brokenriceSmall.trim();
+    public void setBrokenriceSmall(BigDecimal brokenriceSmall) {
+        this.brokenriceSmall = brokenriceSmall;
     }
 
     /**
@@ -573,7 +485,7 @@ public class StorageQualitystandardPreparation {
      * null
      * @return impurity_inorganic null
      */
-    public String getImpurityInorganic() {
+    public BigDecimal getImpurityInorganic() {
         return impurityInorganic;
     }
 
@@ -581,15 +493,15 @@ public class StorageQualitystandardPreparation {
      * null
      * @param impurityInorganic null
      */
-    public void setImpurityInorganic(String impurityInorganic) {
-        this.impurityInorganic = impurityInorganic == null ? null : impurityInorganic.trim();
+    public void setImpurityInorganic(BigDecimal impurityInorganic) {
+        this.impurityInorganic = impurityInorganic;
     }
 
     /**
      * null
      * @return ash_content null
      */
-    public String getAshContent() {
+    public BigDecimal getAshContent() {
         return ashContent;
     }
 
@@ -597,15 +509,15 @@ public class StorageQualitystandardPreparation {
      * null
      * @param ashContent null
      */
-    public void setAshContent(String ashContent) {
-        this.ashContent = ashContent == null ? null : ashContent.trim();
+    public void setAshContent(BigDecimal ashContent) {
+        this.ashContent = ashContent;
     }
 
     /**
      * null
      * @return gluten null
      */
-    public String getGluten() {
+    public BigDecimal getGluten() {
         return gluten;
     }
 
@@ -613,15 +525,15 @@ public class StorageQualitystandardPreparation {
      * null
      * @param gluten null
      */
-    public void setGluten(String gluten) {
-        this.gluten = gluten == null ? null : gluten.trim();
+    public void setGluten(BigDecimal gluten) {
+        this.gluten = gluten;
     }
 
     /**
      * null
      * @return silt_content null
      */
-    public String getSiltContent() {
+    public BigDecimal getSiltContent() {
         return siltContent;
     }
 
@@ -629,15 +541,15 @@ public class StorageQualitystandardPreparation {
      * null
      * @param siltContent null
      */
-    public void setSiltContent(String siltContent) {
-        this.siltContent = siltContent == null ? null : siltContent.trim();
+    public void setSiltContent(BigDecimal siltContent) {
+        this.siltContent = siltContent;
     }
 
     /**
      * null
      * @return magnetic_metal null
      */
-    public String getMagneticMetal() {
+    public BigDecimal getMagneticMetal() {
         return magneticMetal;
     }
 
@@ -645,15 +557,15 @@ public class StorageQualitystandardPreparation {
      * null
      * @param magneticMetal null
      */
-    public void setMagneticMetal(String magneticMetal) {
-        this.magneticMetal = magneticMetal == null ? null : magneticMetal.trim();
+    public void setMagneticMetal(BigDecimal magneticMetal) {
+        this.magneticMetal = magneticMetal;
     }
 
     /**
      * null
      * @return fat_index null
      */
-    public String getFatIndex() {
+    public BigDecimal getFatIndex() {
         return fatIndex;
     }
 
@@ -661,8 +573,8 @@ public class StorageQualitystandardPreparation {
      * null
      * @param fatIndex null
      */
-    public void setFatIndex(String fatIndex) {
-        this.fatIndex = fatIndex == null ? null : fatIndex.trim();
+    public void setFatIndex(BigDecimal fatIndex) {
+        this.fatIndex = fatIndex;
     }
 
     /**
@@ -685,7 +597,7 @@ public class StorageQualitystandardPreparation {
      * null
      * @return acid_value null
      */
-    public String getAcidValue() {
+    public BigDecimal getAcidValue() {
         return acidValue;
     }
 
@@ -693,15 +605,31 @@ public class StorageQualitystandardPreparation {
      * null
      * @param acidValue null
      */
-    public void setAcidValue(String acidValue) {
-        this.acidValue = acidValue == null ? null : acidValue.trim();
+    public void setAcidValue(BigDecimal acidValue) {
+        this.acidValue = acidValue;
+    }
+
+    /**
+     * null
+     * @return gyhz null
+     */
+    public BigDecimal getGyhz() {
+        return gyhz;
+    }
+
+    /**
+     * null
+     * @param gyhz null
+     */
+    public void setGyhz(BigDecimal gyhz) {
+        this.gyhz = gyhz;
     }
 
     /**
      * null
      * @return residual_solvent null
      */
-    public String getResidualSolvent() {
+    public BigDecimal getResidualSolvent() {
         return residualSolvent;
     }
 
@@ -709,15 +637,15 @@ public class StorageQualitystandardPreparation {
      * null
      * @param residualSolvent null
      */
-    public void setResidualSolvent(String residualSolvent) {
-        this.residualSolvent = residualSolvent == null ? null : residualSolvent.trim();
+    public void setResidualSolvent(BigDecimal residualSolvent) {
+        this.residualSolvent = residualSolvent;
     }
 
     /**
      * null
      * @return water_volatiles null
      */
-    public String getWaterVolatiles() {
+    public BigDecimal getWaterVolatiles() {
         return waterVolatiles;
     }
 
@@ -725,15 +653,15 @@ public class StorageQualitystandardPreparation {
      * null
      * @param waterVolatiles null
      */
-    public void setWaterVolatiles(String waterVolatiles) {
-        this.waterVolatiles = waterVolatiles == null ? null : waterVolatiles.trim();
+    public void setWaterVolatiles(BigDecimal waterVolatiles) {
+        this.waterVolatiles = waterVolatiles;
     }
 
     /**
      * null
      * @return insoluble_impurity null
      */
-    public String getInsolubleImpurity() {
+    public BigDecimal getInsolubleImpurity() {
         return insolubleImpurity;
     }
 
@@ -741,15 +669,15 @@ public class StorageQualitystandardPreparation {
      * null
      * @param insolubleImpurity null
      */
-    public void setInsolubleImpurity(String insolubleImpurity) {
-        this.insolubleImpurity = insolubleImpurity == null ? null : insolubleImpurity.trim();
+    public void setInsolubleImpurity(BigDecimal insolubleImpurity) {
+        this.insolubleImpurity = insolubleImpurity;
     }
 
     /**
      * null
      * @return soap_content null
      */
-    public String getSoapContent() {
+    public BigDecimal getSoapContent() {
         return soapContent;
     }
 
@@ -757,15 +685,15 @@ public class StorageQualitystandardPreparation {
      * null
      * @param soapContent null
      */
-    public void setSoapContent(String soapContent) {
-        this.soapContent = soapContent == null ? null : soapContent.trim();
+    public void setSoapContent(BigDecimal soapContent) {
+        this.soapContent = soapContent;
     }
 
     /**
      * null
      * @return smoke_point null
      */
-    public String getSmokePoint() {
+    public BigDecimal getSmokePoint() {
         return smokePoint;
     }
 
@@ -773,7 +701,7 @@ public class StorageQualitystandardPreparation {
      * null
      * @param smokePoint null
      */
-    public void setSmokePoint(String smokePoint) {
-        this.smokePoint = smokePoint == null ? null : smokePoint.trim();
+    public void setSmokePoint(BigDecimal smokePoint) {
+        this.smokePoint = smokePoint;
     }
 }

src/main/java/com/chinaitop/depot/storage/service/StorageQualitystandardMainService.java

@@ -0,0 +1,62 @@
+package com.chinaitop.depot.storage.service;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.chinaitop.depot.storage.model.StorageQualitystandardMain;
+
+public interface StorageQualitystandardMainService {
+
+	/**
+	 * 数据集列表
+	 * @param lspz
+	 * @return
+	 * @throws Exception
+	 */
+	public List<StorageQualitystandardMain> getList(HttpServletRequest request, Integer lspz) throws Exception;
+
+	/**
+	 * 查询一条质量标准配置数据
+	 * 
+	 * @param id 数据ID
+	 * @return
+	 * @throws Exception
+	 */
+	public Map<String, Object> findByIdObj(String id) throws Exception;
+
+	/**
+	 * 查询一条质量标准配置数据
+	 * 
+	 * @param request
+	 * @param obj_main
+	 * @param obj
+	 * @throws Exception
+	 */
+	public void saveOrUpdate(HttpServletRequest request, String obj_main, String obj) throws Exception;
+
+	/**
+	 * 初始化对应品种的化验项初始数据
+	 * 
+	 * @param lspz 粮油品种
+	 * @return
+	 * @throws Exception
+	 */
+	public Map<String, Object> initObj(Integer lspz) throws Exception;
+
+	/**
+	 * 删除一条质量标准配置数据
+	 * 
+	 * @param id
+	 */
+	public void delete(String id) throws Exception;
+
+	/**
+	 * 根据粮油品种查询对应的最新的质量标准配置数据
+	 * 
+	 * @param lspz 粮食品种
+	 * @return
+	 */
+	public Map<String, Object> findLspzObjs(Integer lspz) throws Exception;
+}

src/main/java/com/chinaitop/depot/storage/service/StorageQualitystandardPreparationService.java

@@ -1,18 +0,0 @@
-package com.chinaitop.depot.storage.service;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.chinaitop.depot.storage.model.StorageQualitystandardPreparation;
-
-public interface StorageQualitystandardPreparationService {
-
-	/**
-	 * 数据集列表
-	 * @param lspz
-	 * @return
-	 * @throws Exception
-	 */
-	public List<StorageQualitystandardPreparation> getList(HttpServletRequest request, Integer lspz) throws Exception;
-}

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

@@ -0,0 +1,231 @@
+package com.chinaitop.depot.storage.service.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.chinaitop.depot.storage.mapper.StorageQualitystandardMainMapper;
+import com.chinaitop.depot.storage.mapper.StorageQualitystandardPreparationMapper;
+import com.chinaitop.depot.storage.model.StorageQualitystandardMain;
+import com.chinaitop.depot.storage.model.StorageQualitystandardMainExample;
+import com.chinaitop.depot.storage.model.StorageQualitystandardPreparation;
+import com.chinaitop.depot.storage.model.StorageQualitystandardPreparationExample;
+import com.chinaitop.depot.storage.service.StorageQualitystandardMainService;
+import com.chinaitop.depot.storage.utils.ParameterUtil;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@Service
+public class StorageQualitystandardMainServiceImpl implements StorageQualitystandardMainService {
+
+	@Autowired
+	private StorageQualitystandardMainMapper storageQualitystandardMainMapper;
+
+	@Autowired
+	private StorageQualitystandardPreparationMapper storageQualitystandardPreparationMapper;
+	
+	@Override
+	public List<StorageQualitystandardMain> getList(HttpServletRequest request, Integer lspz) throws Exception {
+
+		/* 获取单位 */
+		int org_id = Integer.parseInt(ObjectUtils.toString(request.getSession().getAttribute("orgId"), "0"));
+
+		/* 组装查询 */
+		StorageQualitystandardMainExample example = new StorageQualitystandardMainExample();
+		StorageQualitystandardMainExample.Criteria criteria = example.createCriteria();
+
+		/* 粮食品种 */
+		if (null != lspz) {
+			criteria.andSubTypeEqualTo(lspz);
+		}
+
+		/* 单位ID */
+		criteria.andOrgIdEqualTo(org_id);
+
+		/* 按照最后修改时间倒序排序 */
+		example.setOrderByClause(" updatetime desc");
+
+		/* 查询 */
+		List<StorageQualitystandardMain> list = storageQualitystandardMainMapper.selectByExample(example);
+
+		return list;
+	}
+
+	@Override
+	public Map<String, Object> findByIdObj(String id) throws Exception {
+		Map<String, Object> map = new HashMap<String, Object>();
+
+		/* 查询主表数据  */
+		StorageQualitystandardMain main = storageQualitystandardMainMapper.selectByPrimaryKey(id);
+		List<StorageQualitystandardPreparation> list = null;
+
+		if (null != main) {
+			String zid = main.getId();
+			StorageQualitystandardPreparationExample example = new StorageQualitystandardPreparationExample();
+			StorageQualitystandardPreparationExample.Criteria criteria = example.createCriteria();
+			criteria.andZIdEqualTo(zid);
+			list = storageQualitystandardPreparationMapper.selectByExample(example);
+
+		} else {
+			main = new StorageQualitystandardMain();
+			main.setCreatetime(new Date());
+			
+		}
+		map.put("obj_main", main);
+		map.put("obj", list);
+
+		return map;
+	}
+
+	@Override
+	public Map<String, Object> initObj(Integer lspz) throws Exception {
+
+		String lypz = lspz+"";
+
+		List<StorageQualitystandardPreparation> list = new ArrayList<StorageQualitystandardPreparation>();
+
+		if ("3164".equals(lypz) || "3165".equals(lypz) || "2777".equals(lypz) || "3166".equals(lypz) || "0".equals(lypz)) {
+
+			StorageQualitystandardPreparation obj = null;
+			for (int i = 3271; i < 3276; i++) {
+				obj = new StorageQualitystandardPreparation();
+				obj.setLevelUpdate(i);;
+				list.add(obj);
+			}
+
+		} else if ("7107".equals(lypz)) {//大米
+
+			/**
+			 * 初始化数据中的十条数据等级的等级
+			 * 规则，分别对应品种籼米(1~3级)、粳米(1~3级)、籼糯米(1~2级)、粳糯米(1~2级)，共十个值
+			 */
+			int []dj = {3271, 3272, 3273, 3271, 3272, 3273, 3271, 3272, 3271, 3272};
+
+			StorageQualitystandardPreparation obj = null;
+			for (int i = 0; i < 10; i++) {
+
+				obj = new StorageQualitystandardPreparation();
+
+				if (i < 3) {//数组0~2是籼米
+
+					obj.setSubTypeDetailed(7047);
+
+				} else if (i > 2 && i < 6) {//数组3~5是粳米
+
+					obj.setSubTypeDetailed(7048);
+
+				} else if (i > 5 && i < 8) {//数组6~7是籼糯米
+
+					obj.setSubTypeDetailed(7105);
+
+				} else if (i > 7 && i < 10) {//数组8~9是粳糯米
+
+					obj.setSubTypeDetailed(7106);
+
+				}
+
+				obj.setLevelUpdate(dj[i]);
+
+				list.add(obj);
+			}
+
+		} else if ("7038".equals(lypz)) {//小麦粉
+			StorageQualitystandardPreparation obj = null;
+			for (int i = 3271; i < 3275; i++) {
+				obj = new StorageQualitystandardPreparation();
+				obj.setLevelUpdate(i);;
+				list.add(obj);
+			}
+		} else if ("7072".equals(lypz)) {//成品大豆油
+			StorageQualitystandardPreparation obj = null;
+			for (int i = 3271; i < 3274; i++) {
+				obj = new StorageQualitystandardPreparation();
+				obj.setLevelUpdate(i);;
+				list.add(obj);
+			}
+		}
+
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("initdata", list);
+
+		return map;
+	}
+
+	@Override
+	@Transactional
+	public void saveOrUpdate(HttpServletRequest request, String obj_main, String obj) throws Exception {
+		String org_id = ObjectUtils.toString(request.getSession().getAttribute("orgId"), "0");
+		ObjectMapper mapper = new ObjectMapper();
+		StorageQualitystandardMain storageQualitystandardMain = mapper.readValue(obj_main, StorageQualitystandardMain.class);
+		List<StorageQualitystandardPreparation> obj_list = mapper.readValue(obj, new TypeReference<List<StorageQualitystandardPreparation>>(){});
+		String id = storageQualitystandardMain.getId();
+		if (StringUtils.isNotBlank(id)) {//修改
+			storageQualitystandardMain.setUpdatetime(new Date());
+			storageQualitystandardMainMapper.updateByPrimaryKeySelective(storageQualitystandardMain);
+			for (StorageQualitystandardPreparation main : obj_list) {
+				storageQualitystandardPreparationMapper.updateByPrimaryKeySelective(main);
+			}
+		} else {//新增
+			id = ParameterUtil.getUuid();
+			storageQualitystandardMain.setId(id);
+			storageQualitystandardMain.setOrgId(Integer.parseInt(org_id));
+			storageQualitystandardMain.setUpdatetime(new Date());
+			storageQualitystandardMainMapper.insertSelective(storageQualitystandardMain);
+			for (StorageQualitystandardPreparation main : obj_list) {
+				main.setId(ParameterUtil.getUuid());
+				main.setzId(id);
+				main.setOrgId(Integer.parseInt(org_id));
+				storageQualitystandardPreparationMapper.insertSelective(main);
+			}
+		}
+	}
+
+	@Override
+	@Transactional
+	public void delete(String id) throws Exception {
+
+		/* 删除主表数据  */
+		storageQualitystandardMainMapper.deleteByPrimaryKey(id);
+
+		/* 删除子表数据  */
+		StorageQualitystandardPreparationExample example = new StorageQualitystandardPreparationExample();
+		StorageQualitystandardPreparationExample.Criteria criteria = example.createCriteria();
+		criteria.andZIdEqualTo(id);
+		storageQualitystandardPreparationMapper.deleteByExample(example);
+	}
+
+	@Override
+	public Map<String, Object> findLspzObjs(Integer lspz) throws Exception {
+		Map<String, Object> map = new HashMap<String, Object>();
+
+		StorageQualitystandardMainExample main_example = new StorageQualitystandardMainExample();
+		StorageQualitystandardMainExample.Criteria main_criteria = main_example.createCriteria();
+		main_criteria.andSubTypeEqualTo(lspz);
+		main_example.setOrderByClause(" updatetime desc");
+		List<StorageQualitystandardMain> main_list = storageQualitystandardMainMapper.selectByExample(main_example);
+		String zid = "";
+		if (null != main_list && main_list.size() > 0) {
+			zid = main_list.get(0).getId();
+		}
+
+		StorageQualitystandardPreparationExample example = new StorageQualitystandardPreparationExample();
+		StorageQualitystandardPreparationExample.Criteria criteria = example.createCriteria();
+		criteria.andZIdEqualTo(zid);
+		List<StorageQualitystandardPreparation> obj_list = storageQualitystandardPreparationMapper.selectByExample(example);
+		map.put("obj_list", obj_list);
+
+		return map;
+	}
+
+
+}

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

@@ -1,46 +0,0 @@
-package com.chinaitop.depot.storage.service.impl;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang.ObjectUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.chinaitop.depot.storage.mapper.StorageQualitystandardPreparationMapper;
-import com.chinaitop.depot.storage.model.StorageQualitystandardPreparation;
-import com.chinaitop.depot.storage.model.StorageQualitystandardPreparationExample;
-import com.chinaitop.depot.storage.service.StorageQualitystandardPreparationService;
-
-@Service
-public class StorageQualitystandardPreparationServiceImpl implements StorageQualitystandardPreparationService {
-
-	@Autowired
-	private StorageQualitystandardPreparationMapper storageQualitystandardPreparationMapper;
-	
-	@Override
-	public List<StorageQualitystandardPreparation> getList(HttpServletRequest request, Integer lspz) throws Exception {
-
-		/* 获取单位 */
-		int org_id = Integer.parseInt(ObjectUtils.toString(request.getSession().getAttribute("orgId"), "0"));
-
-		/* 组装查询 */
-		StorageQualitystandardPreparationExample example = new StorageQualitystandardPreparationExample();
-		StorageQualitystandardPreparationExample.Criteria criteria = example.createCriteria();
-
-		/* 粮食品种 */
-		if (null != lspz) {
-			criteria.andSubTypeEqualTo(lspz);
-		}
-
-		/* 单位ID */
-		criteria.andOrgIdEqualTo(org_id);
-
-		/* 查询 */
-		List<StorageQualitystandardPreparation> list = storageQualitystandardPreparationMapper.selectByExample(example);
-
-		return list;
-	}
-
-}

src/main/java/com/chinaitop/depot/storage/utils/ParameterUtil.java

@@ -7,6 +7,9 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Properties;
+import java.util.UUID;
+
+import org.apache.commons.lang.StringUtils;
 
 public class ParameterUtil {
 
@@ -93,8 +96,10 @@ public class ParameterUtil {
     }
 
     public static void main(String[] args) {
-        System.out.println(stampToDate("1504689208643"));
-        System.out.println(getTimeStamp(getSysDateTime()));
+//        System.out.println(stampToDate("1504689208643"));
+//        System.out.println(getTimeStamp(getSysDateTime()));
+        String a = null;
+        System.out.println(StringUtils.isNotBlank(a));
     }
     public static String getBHS(String BHS){
         String[] str = BHS.split(",");
@@ -167,5 +172,10 @@ public class ParameterUtil {
         }
         return props;
     }
+    
+    public static String getUuid() {
+    	String uuid = UUID.randomUUID().toString().trim().replaceAll("-", "");
+    	return uuid;
+    }
 
 }