解决项目bug

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

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 @Repository
 public interface StorageQualitycheckSonMapper {
@@ -33,5 +34,5 @@ public interface StorageQualitycheckSonMapper {
 
     List<StorageQualitycheckSon> getQualitycheckSonByFoodbasicinfoCheck(Integer id);
 
-    List<StorageQualitycheckSon> selectByQualitycheckId(Integer id);
+    List<Map<String,Object>> selectByQualitycheckId(String id);
 }

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

@@ -205,11 +205,16 @@
     )
   </select>
 
-  <select id="selectByQualitycheckId" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+  <select id="selectByQualitycheckId" resultType="java.util.Map" parameterType="java.lang.String" >
     select
-    <include refid="Base_Column_List" />
-    from storage_qualitycheck_son
-    where qualitycheck_id = #{id,jdbcType=INTEGER}
+      MAX(CASE WHEN enum.enumName='品尝评分' THEN son.set_value END) eat_score,
+      MAX(CASE WHEN enum.enumName='面筋吸水量(%)' THEN son.set_value END) gluten_water_count,
+      MAX(CASE WHEN enum.enumName='玉米赤霉烯酮' THEN son.set_value END) zearalenone,
+      MAX(CASE WHEN enum.enumName='硬度指数' THEN son.set_value END) hard_index
+    FROM
+      storage_qualitycheck_son son
+      LEFT JOIN basic_enum enum ON enum.enumId = son.numbering
+    WHERE qualitycheck_id = #{id,jdbcType=VARCHAR}
   </select>
 
 </mapper>

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

@@ -4,6 +4,7 @@ import com.chinaitop.depot.storage.model.StorageQualitycheckSon;
 import com.chinaitop.depot.storage.model.StorageQualitycheckSonExample;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author sunhongbing
@@ -29,5 +30,5 @@ public interface StorageQualitycheckSonService {
      * @param id
      * @return
      */
-    List<StorageQualitycheckSon> selectByQualitycheckId(Integer id);
+    List<Map<String,Object>> selectByQualitycheckId(String id);
 }

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

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author sunhongbing
@@ -33,7 +34,7 @@ public class StorageQualitycheckSonServiceImpl implements StorageQualitycheckSon
     }
 
     @Override
-    public List<StorageQualitycheckSon> selectByQualitycheckId(Integer id) {
+    public List<Map<String,Object>> selectByQualitycheckId(String id) {
         return qualitycheckSonMapper.selectByQualitycheckId(id);
     }
 }

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

@@ -26,6 +26,10 @@ public class CustomFilter implements Filter {
 		if (!orgId.isEmpty()) {
 			DataPolicyEngine.set(orgId);
 			arg2.doFilter(arg0, arg1);//放行，通过了当前过滤器，递交给下一个filter进行过滤
+		}else if ("/quality/outQualitycheck".equals(request.getServletPath()+request.getPathInfo())
+				||"/quality/setQualitycheckType".equals(request.getServletPath()+request.getPathInfo())
+				||"/quality/downFcInfo".equals(request.getServletPath()+request.getPathInfo())) {
+			arg2.doFilter(arg0, arg1);//放行，通过了当前过滤器，递交给下一个filter进行过滤
 		}
 		DataPolicyEngine.remove();
 	}

src/main/java/com/chinaitop/depot/unissoft/webservice/QualityCheckFCServiceImpl.java

@@ -11,7 +11,10 @@ import com.chinaitop.depot.storage.controller.StorageQualitycheckController;
 import com.chinaitop.depot.storage.mapper.StorageQualitycheckMapper;
 import com.chinaitop.depot.storage.model.StorageQualitycheck;
 import com.chinaitop.depot.storage.model.StorageQualitycheckExample;
+import com.chinaitop.depot.storage.model.StorageQualitycheckSon;
+import com.chinaitop.depot.storage.model.StorageQualitycheckSonExample;
 import com.chinaitop.depot.storage.service.StorageQualitycheckService;
+import com.chinaitop.depot.storage.service.StorageQualitycheckSonService;
 import com.chinaitop.depot.storage.utils.ParameterUtil;
 import org.apache.commons.lang.ObjectUtils;
 import org.slf4j.Logger;
@@ -35,6 +38,9 @@ public class QualityCheckFCServiceImpl implements QualityCheckFCService {
 	@Resource
 	private StorageQualitycheckService storageQualitycheckService;
 
+	@Resource
+	private StorageQualitycheckSonService qualitycheckSonService;
+
 	@Override
 	public String outQualitycheck(String houseId,String warehouseId,String subType,String orgId) {
 		Map<String, Object> result = new HashMap<String, Object>();
@@ -55,6 +61,12 @@ public class QualityCheckFCServiceImpl implements QualityCheckFCService {
 				qualityCheckExample.setOrgId(Integer.parseInt(orgId));//组织机构ID
 				List<Map<String, Object>> list = storageQualitycheckService.findByOrdId(qualityCheckExample);
 
+				for (Map<String, Object> quality : list) {
+					List<Map<String, Object>> storageQualitycheckSon = qualitycheckSonService.selectByQualitycheckId(quality.get("id").toString());
+					for (Map<String, Object> son : storageQualitycheckSon) {
+						quality.putAll(son);
+					}
+				}
 
 				result.put("qualitycheckData", list);
 				result.put("success", "true");