检查-强检

src/main/java/com/chinaitop/DatePermissionInterceptor.java

@@ -70,7 +70,8 @@ public class DatePermissionInterceptor implements Interceptor {
 							+ " WHERE FIND_IN_SET(org_id,getChildrenOrg("+orgId+"))) org_info ");
 				}else if(!"com.chinaitop.depot.storage.mapper.StorageStorehouseBusinessMapper.selectLsreport".equals(mappedStatement.getId())
 						&& !"com.chinaitop.depot.storage.mapper.StorageQualitycheckMapper.getStoreQualityList".equals(mappedStatement.getId())
-						&& !"com.chinaitop.depot.storage.mapper.XwkZljcMapper.selectByExample".equals(mappedStatement.getId())
+						&& !"com.chinaitop.depot.storage.mapper.XwkZljcMapper.selectByList_COUNT".equals(mappedStatement.getId())
+						&& !"com.chinaitop.depot.storage.mapper.XwkZljcMapper.selectByList".equals(mappedStatement.getId())
 						&& !"com.chinaitop.depot.storage.mapper.XwkZljcMapper.selectByPrimaryKey".equals(mappedStatement.getId())
 						&& !"com.chinaitop.depot.storage.mapper.XwkZljcmxMapper.selectByExample".equals(mappedStatement.getId())
 						&& !"com.chinaitop.depot.storage.model.StorageFoodbasicinfo.getFoodbasicInfoByHouseIdAndWarehouseId".equals(mappedStatement.getId())){

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

@@ -1,7 +1,6 @@
 package com.chinaitop.depot.storage.controller;
 
 import com.chinaitop.depot.storage.model.XwkZljc;
-import com.chinaitop.depot.storage.model.XwkZljcExample;
 import com.chinaitop.depot.storage.service.impl.XwkZljcServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -44,39 +43,38 @@ public class XwkZljcController {
             @ApiImplicitParam(name = "checktype", value = "检查的类型", paramType = "query"),
             @ApiImplicitParam(name = "companyOrgCode", value = "组织机构代码", paramType = "query"),
     })
-    public PageInfo<XwkZljc> listPage(Integer pageNum, Integer pageSize,String houseName,String warehouseName,String checktype,String companyOrgCode) {
+    public PageInfo<XwkZljc> listPage(Integer pageNum, Integer pageSize,String houseId,String warehouseId,String checktype,String companyOrgCode) {
 
-        XwkZljcExample example = new XwkZljcExample();
-        XwkZljcExample.Criteria criteria = example.createCriteria();
+        XwkZljc xwkZljc = new XwkZljc();
 
         //类型
         if(StringUtils.isNotBlank(checktype)){
             if(checktype.equals("2")){
-                criteria.andJclxEqualTo("强检");
+                xwkZljc.setJclx("强检");
             }else{
-                criteria.andJclxNotEqualTo("强检");
+                xwkZljc.setJclx("入库质检");
             }
         }
 
         //组织机构
         if(StringUtils.isNotBlank(companyOrgCode)){
-            criteria.andZzjgdmEqualTo(companyOrgCode);
+            xwkZljc.setKqmc(companyOrgCode);
         }
 
         //仓房
-        if(StringUtils.isNotBlank(houseName)){
-            criteria.andCfmcEqualTo(houseName);
+        if(StringUtils.isNotBlank(houseId)){
+            xwkZljc.setHouseId(houseId);
         }
 
-        if(StringUtils.isNotBlank(warehouseName)){
-            criteria.andHwmcEqualTo(warehouseName);
+        if(StringUtils.isNotBlank(warehouseId)){
+            xwkZljc.setWarehouseId(warehouseId);
         }
 
         if (pageNum!=null && pageSize!=null) {
             PageHelper.startPage(pageNum, pageSize);
         }
 
-        List<XwkZljc> list = xwkZljcServiceImpl.queryXwkZljc(example);
+        List<XwkZljc> list = xwkZljcServiceImpl.queryXwkZljc(xwkZljc);
 
         PageInfo<XwkZljc> pageInfo = new PageInfo<XwkZljc>(list);
         return pageInfo;

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

@@ -19,7 +19,7 @@ public interface XwkZljcMapper {
 
     List<XwkZljc> selectByExample(XwkZljcExample example);
 
-    XwkZljc selectByPrimaryKey(String zljcid);
+    XwkZljc selectByPrimaryKey(@Param("zljcid") String zljcid);
 
     int updateByExampleSelective(@Param("record") XwkZljc record, @Param("example") XwkZljcExample example);
 
@@ -28,4 +28,6 @@ public interface XwkZljcMapper {
     int updateByPrimaryKeySelective(XwkZljc record);
 
     int updateByPrimaryKey(XwkZljc record);
+
+    List<XwkZljc> selectByList(XwkZljc xwkZljc);
 }

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

@@ -25,6 +25,10 @@
     <result column="jybgcjrq" property="jybgcjrq" jdbcType="VARCHAR" />
     <result column="sjly" property="sjly" jdbcType="VARCHAR" />
     <result column="zzjgdm" property="zzjgdm" jdbcType="VARCHAR" />
+    <result column="storehouse_id" property="houseId" jdbcType="VARCHAR" />
+    <result column="storehouse_name" property="houseName" jdbcType="VARCHAR" />
+    <result column="warehouse_id" property="warehouseId" jdbcType="VARCHAR" />
+    <result column="warehouse_name" property="warehouseName" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -104,9 +108,15 @@
   </select>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select
-    <include refid="Base_Column_List" />
-    from xwk_zljc
-    where zljcid = #{zljcid,jdbcType=VARCHAR}
+    T1.zljcid, T1.yyywid, T1.jclx, T1.pz, T1.xxdpz, T1.dj,
+    replace(to_char(to_date(T1.jyrq,'yyyy年mm月dd日'),'yyyy-mm-dd'),'00','20') jyrq,
+    T1.jyjg, T1.kqmc, T1.cfmc, T1.hwmc, T1.jyr, T1.jydw, T1.rksj,
+    T1.sl, T1.cd, T1.bgy, T1.shnd, T1.qyr, T1.qyrq, T1.jybgcjrq, T1.sjly, T1.zzjgdm,
+    T2.warehouse_id, T2.warehouse_name, T3.storehouse_id, T3.storehouse_name
+    from xwk_zljc T1
+    left join basic_warehouse T2 on T1.hwmc = T2.hwbm
+    left join basic_storehouse T3 on T2.storehouse_id = T3.storehouse_id
+    where T1.zljcid = #{zljcid,jdbcType=VARCHAR} and T3.library_type = 0
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from xwk_zljc
@@ -489,4 +499,32 @@
       zzjgdm = #{zzjgdm,jdbcType=VARCHAR}
     where zljcid = #{zljcid,jdbcType=VARCHAR}
   </update>
+
+  <select id="selectByList" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.XwkZljc" >
+    select
+    T1.zljcid, T1.yyywid, T1.jclx, T1.pz, T1.xxdpz, T1.dj,
+    replace(to_char(to_date(T1.jyrq,'yyyy年mm月dd日'),'yyyy-mm-dd'),'00','20') jyrq,
+    T1.jyjg, T1.kqmc, T1.cfmc, T1.hwmc, T1.jyr, T1.jydw, T1.rksj,
+    T1.sl, T1.cd, T1.bgy, T1.shnd, T1.qyr, T1.qyrq, T1.jybgcjrq, T1.sjly, T1.zzjgdm,
+    T2.warehouse_id, T2.warehouse_name, T3.storehouse_id, T3.storehouse_name
+    from xwk_zljc T1
+    left join basic_warehouse T2 on T1.hwmc = T2.hwbm
+    left join basic_storehouse T3 on T2.storehouse_id = T3.storehouse_id
+    <where>
+      <if test="jclx !=null">
+        and T1.jclx = #{jclx}
+      </if>
+      <if test="kqmc !=null">
+        and T1.kqmc = #{kqmc}
+      </if>
+      <if test="warehouseId !=null">
+        and T2.wareHouse_id = #{warehouseId}
+      </if>
+      <if test="houseId !=null">
+        and T3.storehouse_id = #{houseId}
+      </if>
+        and T3.library_type = '0'
+    </where>
+  </select>
+
 </mapper>

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

@@ -47,6 +47,13 @@ public class XwkZljc {
 
     private String zzjgdm;
 
+
+    //仓房货位
+    private String houseId;
+    private String houseName;
+    private String warehouseId;
+    private String warehouseName;
+
     /**
      * 质量检测id
      * @return zljcid 质量检测id
@@ -414,4 +421,37 @@ public class XwkZljc {
     public void setZzjgdm(String zzjgdm) {
         this.zzjgdm = zzjgdm == null ? null : zzjgdm.trim();
     }
+
+
+    public String getHouseId() {
+        return houseId;
+    }
+
+    public void setHouseId(String houseId) {
+        this.houseId = houseId;
+    }
+
+    public String getHouseName() {
+        return houseName;
+    }
+
+    public void setHouseName(String houseName) {
+        this.houseName = houseName;
+    }
+
+    public String getWarehouseId() {
+        return warehouseId;
+    }
+
+    public void setWarehouseId(String warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName;
+    }
 }

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

@@ -2,14 +2,13 @@ package com.chinaitop.depot.storage.service;
 
 
 import com.chinaitop.depot.storage.model.XwkZljc;
-import com.chinaitop.depot.storage.model.XwkZljcExample;
 
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 
 public interface XwkZljcService {
 
-    List<XwkZljc> queryXwkZljc(XwkZljcExample example);
+    List<XwkZljc> queryXwkZljc(XwkZljc xwkZljc);
 
     ConcurrentHashMap<String, Object> loadDataById(String id);
 }

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

@@ -3,7 +3,6 @@ package com.chinaitop.depot.storage.service.impl;
 import com.chinaitop.depot.storage.mapper.XwkZljcMapper;
 import com.chinaitop.depot.storage.mapper.XwkZljcmxMapper;
 import com.chinaitop.depot.storage.model.XwkZljc;
-import com.chinaitop.depot.storage.model.XwkZljcExample;
 import com.chinaitop.depot.storage.model.XwkZljcmx;
 import com.chinaitop.depot.storage.model.XwkZljcmxExample;
 import com.chinaitop.depot.storage.service.XwkZljcService;
@@ -23,8 +22,8 @@ public class XwkZljcServiceImpl implements XwkZljcService {
     private XwkZljcmxMapper xwkZljcmxMapper;
 
     @Override
-    public List<XwkZljc> queryXwkZljc(XwkZljcExample example) {
-        return xwkZljcMapper.selectByExample(example);
+    public List<XwkZljc> queryXwkZljc(XwkZljc xwkZljc) {
+        return xwkZljcMapper.selectByList(xwkZljc);
     }
 
     @Override