添加字段,添加查询条件

src/main/java/com/chinaitop/depot/qualityControl/mapper/BusinessQcQualityInspectionMapper.xml

@@ -41,6 +41,12 @@
     <result column="sample_status" property="sampleStatus" jdbcType="VARCHAR" />
     <result column="sample_package_model" property="samplePackageModel" jdbcType="VARCHAR" />
     <result column="bz" property="bz" jdbcType="VARCHAR" />
+
+    <result column="suitable_quantity" property="suitableQuantity" jdbcType="DECIMAL" />
+    <result column="suitable_rate" property="suitableRate" jdbcType="DECIMAL" />
+    <result column="person_work" property="personWork" jdbcType="VARCHAR" />
+    <result column="report_name" property="reportName" jdbcType="VARCHAR" />
+    <result column="person_name" property="personName" jdbcType="VARCHAR" />
   </resultMap>
 
   <resultMap id="BaseResultMap1" extends="BaseResultMap" type="com.chinaitop.depot.qualityControl.model.BusinessQcQualityInspection">
@@ -119,7 +125,7 @@
     warehouse_id, grain_variety_id, grain_nature_id, grain_grade_id, rkrq, receive_year, produce_area,
     jysj, check_result, jydw, jyr, jyyj, zblb, spaqzbsfhg, qfrq, bgcjsj, shrxm, sfzcccnx, 
     zbjgpd, qysj, qydbh, qyrxm, qyqy, jdrxm, ypbh, ypsl, dbsl, ypdj, sample_status, sample_package_model, 
-    bz
+    bz, suitable_quantity, suitable_rate, person_work, report_name, person_name
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.qualityControl.model.BusinessQcQualityInspectionExample" >
     select
@@ -164,7 +170,8 @@
       qydbh, qyrxm, qyqy, 
       jdrxm, ypbh, ypsl, 
       dbsl, ypdj, sample_status, 
-      sample_package_model, bz)
+      sample_package_model, bz,
+      suitable_quantity, suitable_rate, person_work, report_name, person_name)
     values (#{id,jdbcType=INTEGER}, #{createdate,jdbcType=TIMESTAMP}, #{updatename,jdbcType=VARCHAR}, 
       #{updatedate,jdbcType=TIMESTAMP}, #{zjbgdh,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, 
       #{jylb,jdbcType=VARCHAR}, #{basicStorehouseId,jdbcType=INTEGER}, #{warehouseId,jdbcType=INTEGER}, 
@@ -177,7 +184,8 @@
       #{qydbh,jdbcType=VARCHAR}, #{qyrxm,jdbcType=VARCHAR}, #{qyqy,jdbcType=VARCHAR}, 
       #{jdrxm,jdbcType=VARCHAR}, #{ypbh,jdbcType=VARCHAR}, #{ypsl,jdbcType=DECIMAL}, 
       #{dbsl,jdbcType=DECIMAL}, #{ypdj,jdbcType=VARCHAR}, #{sampleStatus,jdbcType=VARCHAR}, 
-      #{samplePackageModel,jdbcType=VARCHAR}, #{bz,jdbcType=VARCHAR})
+      #{samplePackageModel,jdbcType=VARCHAR}, #{bz,jdbcType=VARCHAR}), #{suitableQuantity,jdbcType=DECIMAL}, #{suitableRate,jdbcType=DECIMAL},
+      #{personWork,jdbcType=VARCHAR}, #{personName,jdbcType=VARCHAR}
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.qualityControl.model.BusinessQcQualityInspection" useGeneratedKeys="true" keyProperty="id" >
     insert into business_qc_quality_inspection
@@ -299,6 +307,21 @@
       <if test="bz != null" >
         bz,
       </if>
+      <if test="suitableQuantity != null" >
+        suitable_quantity,
+      </if>
+      <if test="suitableRate != null" >
+        suitable_rate,
+      </if>
+      <if test="personWork != null" >
+        person_work,
+      </if>
+      <if test="reportName != null" >
+        report_name,
+      </if>
+      <if test="personName != null" >
+        person_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -415,6 +438,21 @@
       <if test="bz != null" >
         #{bz,jdbcType=VARCHAR},
       </if>
+      <if test="suitableQuantity != null" >
+        #{suitableQuantity,jdbcType=DECIMAL},
+      </if>
+      <if test="suitableRate != null" >
+        #{suitableRate,jdbcType=DECIMAL},
+      </if>
+      <if test="personWork != null" >
+        #{personWork,jdbcType=VARCHAR},
+      </if>
+      <if test="reportName != null" >
+        #{reportName,jdbcType=VARCHAR},
+      </if>
+      <if test="personName != null" >
+        #{personName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.qualityControl.model.BusinessQcQualityInspectionExample" resultType="java.lang.Integer" >
@@ -543,6 +581,21 @@
       <if test="record.bz != null" >
         bz = #{record.bz,jdbcType=VARCHAR},
       </if>
+      <if test="record.suitableQuantity != null" >
+        suitableQuantity = #{record.suitableQuantity,jdbcType=DECIMAL},
+      </if>
+      <if test="record.suitableRate != null" >
+        suitableRate = #{record.suitableRate,jdbcType=DECIMAL},
+      </if>
+      <if test="record.personWork != null" >
+        personWork = #{record.personWork,jdbcType=VARCHAR},
+      </if>
+      <if test="record.reportName != null" >
+        reportName = #{record.reportName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.personName != null" >
+        personName = #{record.personName,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -589,6 +642,11 @@
       sample_status = #{record.sampleStatus,jdbcType=VARCHAR},
       sample_package_model = #{record.samplePackageModel,jdbcType=VARCHAR},
       bz = #{record.bz,jdbcType=VARCHAR}
+      suitable_quantity = #{record.suitableQuantity,jdbcType=DECIMAL},
+      suitable_rate = #{record.suitableRate,jdbcType=DECIMAL},
+      person_work = #{record.personWork,jdbcType=VARCHAR}
+      report_name = #{record.reportName,jdbcType=VARCHAR}
+      person_name = #{record.personName,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -710,6 +768,21 @@
       <if test="bz != null" >
         bz = #{bz,jdbcType=VARCHAR},
       </if>
+      <if test="suitableQuantity != null" >
+        suitable_quantity = #{suitableQuantity,jdbcType=DECIMAL},
+      </if>
+      <if test="suitableRate != null" >
+        suitable_rate = #{suitableRate,jdbcType=DECIMAL},
+      </if>
+      <if test="personWork != null" >
+        person_work = #{personWork,jdbcType=VARCHAR},
+      </if>
+      <if test="reportName != null" >
+        report_name = #{reportName,jdbcType=VARCHAR},
+      </if>
+      <if test="personName != null" >
+        person_name = #{personName,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -753,6 +826,11 @@
       sample_status = #{sampleStatus,jdbcType=VARCHAR},
       sample_package_model = #{samplePackageModel,jdbcType=VARCHAR},
       bz = #{bz,jdbcType=VARCHAR}
+      suitable_quantity = #{suitableQuantity,jdbcType=DECIMAL},
+      suitable_rate = #{suitableRate,jdbcType=DECIMAL},
+      person_work = #{personWork,jdbcType=VARCHAR},
+      report_name = #{reportName,jdbcType=VARCHAR},
+      person_name = #{personName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectOnly" parameterType="map" resultType="string">
@@ -789,11 +867,18 @@
     LEFT JOIN basic_enum be ON qqi.grain_variety_id = be.enumId
     LEFT JOIN basic_enum be1 ON qqi.grain_nature_id = be1.enumId
     <where>
+      qqi.org_id = #{orgId}
       <if test="storehouseName != null and storehouseName != ''">
-        bs.storehouse_name LIKE concat("%",#{storehouseName},"%")
+        and bs.storehouse_name LIKE concat("%",#{storehouseName},"%")
       </if>
-      <if test="orgId != null and orgId != ''">
-        and qqi.org_id = #{orgId}
+      <if test="grainVarietyName != null and grainVarietyName != ''">
+        and be.enumname LIKE concat("%",#{grainVarietyName},"%")
+      </if>
+      <if test="grainNatureName != null and grainNatureName != ''">
+        and be1.enumname LIKE concat("%",#{grainNatureName},"%")
+      </if>
+      <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+        and qqi.jysj BETWEEN #{startTime} AND #{endTime}
       </if>
     </where>
   </select>
@@ -849,8 +934,7 @@
         parentId = #{parentId}
     AND delFlag = 1
   </select>
-  <select id="getQualityInspectionFindByWarehouseId"
-          resultType="com.chinaitop.depot.qualityControl.model.BusinessQcQualityInspection" resultMap="BaseResultMap1">
+  <select id="getQualityInspectionFindByWarehouseId" resultType="com.chinaitop.depot.qualityControl.model.BusinessQcQualityInspection" resultMap="BaseResultMap1">
     select
       bqq.id,
       bqq.jylb,

src/main/java/com/chinaitop/depot/qualityControl/model/BusinessQcQualityInspection.java

@@ -93,6 +93,22 @@ public class BusinessQcQualityInspection {
 
     private String bz;
 
+    // 增加宜存数量字段
+    @ApiModelProperty(value = "宜存数量", position = 45)
+    private BigDecimal suitableQuantity;
+    // 增加宜存率字段
+    @ApiModelProperty(value = "宜存率", position = 45)
+    private BigDecimal suitableRate;
+    // 增加人员工作量字段
+    @ApiModelProperty(value = "人员工作量", position = 45)
+    private String personWork;
+
+    @ApiModelProperty(value = "检测报告名称")
+    private String reportName;
+
+    @ApiModelProperty(value = "人员名称")
+    private String personName;
+
     // 子表数组
     private List<BusinessQcQualityInspectionItem> item;
     private   Map<Integer, List<String>> maps;
@@ -838,4 +854,44 @@ public class BusinessQcQualityInspection {
     public void setBz(String bz) {
         this.bz = bz == null ? null : bz.trim();
     }
+
+    public BigDecimal getSuitableQuantity() {
+        return suitableQuantity;
+    }
+
+    public void setSuitableQuantity(BigDecimal suitableQuantity) {
+        this.suitableQuantity = suitableQuantity;
+    }
+
+    public BigDecimal getSuitableRate() {
+        return suitableRate;
+    }
+
+    public void setSuitableRate(BigDecimal suitableRate) {
+        this.suitableRate = suitableRate;
+    }
+
+    public String getPersonWork() {
+        return personWork;
+    }
+
+    public void setPersonWork(String personWork) {
+        this.personWork = personWork;
+    }
+
+    public String getReportName() {
+        return reportName;
+    }
+
+    public void setReportName(String reportName) {
+        this.reportName = reportName;
+    }
+
+    public String getPersonName() {
+        return personName;
+    }
+
+    public void setPersonName(String personName) {
+        this.personName = personName;
+    }
 }

src/main/java/com/chinaitop/depot/qualityControl/model/BusinessQcQualityInspectionPage.java

@@ -25,4 +25,18 @@ public class BusinessQcQualityInspectionPage extends PageParam implements Serial
     @NotBlank(message = "库区编码不能为空")
     private String orgId;
 
+    @ApiModelProperty(value = "品种名称")
+    private String grainVarietyName;
+
+    @ApiModelProperty(value = "性质名称")
+    private String grainNatureName;
+
+    @ApiModelProperty(value = "检验日期(yyyy-MM-dd)传一个后台拼接")
+    private String jysj;
+
+    @ApiModelProperty(value = "检验日期-开始(yyyy-MM-dd HH:mm:ss)")
+    private String startTime;
+
+    @ApiModelProperty(value = "检验日期-结束(yyyy-MM-dd HH:mm:ss)")
+    private String endTime;
 }

src/main/java/com/chinaitop/depot/qualityControl/service/impl/QualityInspectionServiceImpl.java

@@ -41,13 +41,13 @@ public class QualityInspectionServiceImpl implements QualityInspectionService {
     private BusinessQcQualityInspectionMapper qualityInspectionMapper;
     @Resource
     private BusinessQcQualityInspectionItemMapper qualityInspectionItemMapper;
-    
+
     @Resource
     private RestTemplate restTemplate;
 
     @Value("${jsgjjsjUrl}")
     private String jsgjjsjUrl;
-    
+
 
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -72,8 +72,8 @@ public class QualityInspectionServiceImpl implements QualityInspectionService {
                     qualityInspectionItemMapper.insert(i);
                 });
             }
-            
-            this.gjjjk(id.toString(),saveParam.getOrgId().toString(),"i");
+
+            this.gjjjk(id.toString(), saveParam.getOrgId().toString(), "i");
         }
         return insert;
     }
@@ -104,6 +104,11 @@ public class QualityInspectionServiceImpl implements QualityInspectionService {
     @Override
     public PageInfo<BusinessQcQualityInspection> getPageList(BusinessQcQualityInspectionPage pageParam) {
         PageHelper.startPage(pageParam.getPageNum(), pageParam.getPageSize());
+        String jysj = pageParam.getJysj();
+        if (!StringUtils.isEmpty(jysj)) {
+            pageParam.setStartTime(String.format("%s%s", jysj, " 00:00:00"));
+            pageParam.setEndTime(String.format("%s%s", jysj, " 23:59:59"));
+        }
         List<BusinessQcQualityInspection> list = qualityInspectionMapper.getPageList(pageParam);
         return new PageInfo<>(list);
     }
@@ -118,8 +123,8 @@ public class QualityInspectionServiceImpl implements QualityInspectionService {
                 it.setUpdatedate(new Date());
                 qualityInspectionItemMapper.updateByPrimaryKey(it);
             });
-            
-            this.gjjjk(saveParam.getId().toString(),saveParam.getOrgId().toString(),"u");
+
+            this.gjjjk(saveParam.getId().toString(), saveParam.getOrgId().toString(), "u");
         }
         return i;
     }
@@ -137,15 +142,15 @@ public class QualityInspectionServiceImpl implements QualityInspectionService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int deleteByMasterId(Integer id,Integer orgId) {
+    public int deleteByMasterId(Integer id, Integer orgId) {
         // 删除主表数据
         int i = qualityInspectionMapper.deleteByPrimaryKey(id);
         if (i > 0) {
             BusinessQcQualityInspectionItemExample example = new BusinessQcQualityInspectionItemExample();
             example.createCriteria().andQcQualityInspectionIdEqualTo(id);
             qualityInspectionItemMapper.deleteByExample(example);
-            
-            this.gjjjk(id.toString(),orgId.toString(),"d");
+
+            this.gjjjk(id.toString(), orgId.toString(), "d");
         }
         return i;
     }
@@ -159,24 +164,24 @@ public class QualityInspectionServiceImpl implements QualityInspectionService {
     public List<Map<String, Object>> getEnumTreeList(Integer parentId) {
         return qualityInspectionMapper.getEnumTreeList(parentId);
     }
-    
+
     /**
-	 * 国家局数据
-	 */
-    public void gjjjk(String id, String orgId,String czbz) {
-    	
-		String tableName = "ODS_UP_ZJXXJK";
-		/**
+     * 国家局数据
+     */
+    public void gjjjk(String id, String orgId, String czbz) {
+
+        String tableName = "ODS_UP_ZJXXJK";
+        /**
          * restTemplate调用
          */
         //String url = "http://localhost:9022/recPublish/sendMessage";//
         //发送post请求，并打印结果，以String类型接收响应结果JSON字符串
-		
+
         MultiValueMap<String, Object> sendMap = new LinkedMultiValueMap<>();
-		sendMap.add("tableName", tableName);
-		sendMap.add("czbz", czbz);
-		sendMap.add("ywId", id);
-		sendMap.add("orgId", orgId);
+        sendMap.add("tableName", tableName);
+        sendMap.add("czbz", czbz);
+        sendMap.add("ywId", id);
+        sendMap.add("orgId", orgId);
 
         restTemplate.postForObject(jsgjjsjUrl, sendMap, String.class);
     }