浏览代码

质检检验项做更改

mengy 5 年之前
父节点
当前提交
30aa1607ef

+ 26 - 4
src/main/java/com/chinaitop/depot/storage/controller/StorageQualitycheckController.java

@@ -165,14 +165,16 @@ public class StorageQualitycheckController {
165 165
     @ApiOperation(value="新增/修改数据", notes = "新增/修改数据")
166 166
     @ApiImplicitParams({
167 167
             @ApiImplicitParam(name = "qualitycheckJson", value = "质量基础信息JSON数据对象", paramType = "form"),
168
-            @ApiImplicitParam(name = "qualityOneJson", value = "质量检测信息JSON数据对象", paramType = "form")
168
+            @ApiImplicitParam(name = "qualityOneJson", value = "质量检测信息JSON数据对象", paramType = "form"),
169
+            @ApiImplicitParam(name = "qualityJson", value = "质量检测信息JSON数据对象", paramType = "form")
169 170
     })
170
-    public Map<String, Object> save(String qualitycheckJson,String qualityOneJson) {
171
+    public Map<String, Object> save(String qualitycheckJson,String qualityOneJson,String qualityJson) {
171 172
         Map<String, Object> modelMap = new HashMap<>();
172 173
         // JSON字符串转对象
173 174
         ObjectMapper mapper = new ObjectMapper();
174 175
         StorageQualitycheck qualitycheck = null;
175 176
         List<StorageQualitycheckSon> qualitycheckone = null;
177
+        List<StorageQualitycheckSon> quality = null;
176 178
         try {
177 179
             qualitycheck = (StorageQualitycheck)mapper.readValue(qualitycheckJson, StorageQualitycheck.class);
178 180
             //默认0:未封仓   1:已封仓
@@ -187,6 +189,14 @@ public class StorageQualitycheckController {
187 189
                     storageQualitycheckService.saveOne(qualitycheckone.get(i));
188 190
                 }
189 191
             }
192
+            if(StringUtils.isNoneBlank(qualityJson)){
193
+                quality = mapper.readValue(qualityJson,  new TypeReference<List<StorageQualitycheckSon>>(){});
194
+                for (int i = 0; i < quality.size(); i++) {
195
+                    quality.get(i).setQualitycheckId(qualitycheck.getId());
196
+                    quality.get(i).setNumbering(Integer.valueOf(quality.get(i).getEnumid()));
197
+                    storageQualitycheckService.saveOne(quality.get(i));
198
+                }
199
+            }
190 200
             modelMap.put("status", "success");
191 201
         } catch (IOException e) {
192 202
             modelMap.put("status", "error");
@@ -205,8 +215,8 @@ public class StorageQualitycheckController {
205 215
     @ApiImplicitParams({
206 216
             @ApiImplicitParam(name = "id", value = "id", paramType = "query"),
207 217
     })
208
-    public StorageQualitycheck loadDataById(Integer id){
209
-        StorageQualitycheck qualitycheck=storageQualitycheckService.loadDataById(id);
218
+    public Map<String, Object> loadDataById(Integer id){
219
+        Map<String, Object> qualitycheck=storageQualitycheckService.loadDataById(id);
210 220
         return qualitycheck;
211 221
     }
212 222
 
@@ -370,7 +380,19 @@ public class StorageQualitycheckController {
370 380
                 foodbasicinfo.setDisperseCapacity(list.get(0).getDisperseCapacity());
371 381
                 foodbasicinfo.setKeepMethod(list.get(0).getKeepMethod());
372 382
                 foodbasicinfo.setPrice(list.get(0).getPrice());
383
+                foodbasicinfo.setWareHouseName(list.get(0).getWareHouseName());
384
+                foodbasicinfo.setStorehouseName(list.get(0).getStorehouseName());
373 385
                 foodbasicinfo.setStorageLocation(list.get(0).getDepotName());
386
+                foodbasicinfo.setPlaceOfOrigin(String.valueOf(list.get(0).getLocation()));//产地
387
+                foodbasicinfo.setSubType(list.get(0).getSubType());//粮食品种
388
+                foodbasicinfo.setNumber(Double.valueOf(list.get(0).getNumber()));//数量
389
+                foodbasicinfo.setQuality(list.get(0).getQuality());//数量
390
+                foodbasicinfo.setGrowYear(list.get(0).getHarvestTime());//收货年度
391
+                foodbasicinfo.setLevel(String.valueOf(list.get(0).getLevel()));//d等级
392
+                foodbasicinfo.setInputYear(list.get(0).getInputTime());//ruca入仓时间
393
+                foodbasicinfo.setKeeperNames(list.get(0).getKeeper());//b保管员
394
+                //保管单位-当前登录人的组织
395
+
374 396
             }
375 397
 
376 398
         } catch (Exception e) {

+ 8 - 0
src/main/java/com/chinaitop/depot/storage/mapper/StorageQualitycheckMapper.xml

@@ -1974,6 +1974,14 @@
1974 1974
     select
1975 1975
     sqk.id,
1976 1976
     sqk.house_id, sqk.warehouse_id,
1977
+    sqk.location,
1978
+    sqk.number,
1979
+    sqk.sub_type,
1980
+    sqk.harvest_time,
1981
+    sqk.quality,
1982
+    sqk.input_time,
1983
+    sqk.level,
1984
+    sqk.keeper,
1977 1985
     bs.storeHouse_name storehouseName,
1978 1986
     bs.keeping_way keepMethod,
1979 1987
     bs.grain_heigth height,

+ 2 - 0
src/main/java/com/chinaitop/depot/storage/mapper/StorageQualitycheckSonMapper.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
6 6
 import org.springframework.stereotype.Repository;
7 7
 
8 8
 import java.util.List;
9
+import java.util.Map;
9 10
 
10 11
 @Repository
11 12
 public interface StorageQualitycheckSonMapper {
@@ -20,6 +21,7 @@ public interface StorageQualitycheckSonMapper {
20 21
     int insertSelective(StorageQualitycheckSon record);
21 22
 
22 23
     List<StorageQualitycheckSon> selectByExample(StorageQualitycheckSonExample example);
24
+    Map<String, Object> selectsonByExample(Integer id);
23 25
 
24 26
     StorageQualitycheckSon selectByPrimaryKey(Integer id);
25 27
 

+ 58 - 0
src/main/java/com/chinaitop/depot/storage/mapper/StorageQualitycheckSonMapper.xml

@@ -88,6 +88,64 @@
88 88
     from storage_qualitycheck_son
89 89
     where id = #{id,jdbcType=INTEGER}
90 90
   </select>
91
+  <select id="selectsonByExample" parameterType="java.lang.Integer" resultType="map">
92
+    SELECT DISTINCT  a.qualitycheck_id,
93
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2783' ) AS '2783',
94
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2784' ) AS '2784',
95
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2785' ) AS '2785',
96
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2786' ) AS '2786',
97
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2787' ) AS '2787',
98
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2788' ) AS '2788',
99
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2789' ) AS '2789',
100
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2790' ) AS '2790',
101
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='6995' ) AS '6995',
102
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='6996' ) AS '6996',
103
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='7222' ) AS '7222',
104
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='7223' ) AS '7223',
105
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='7224' ) AS '7224',
106
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='7225' ) AS '7225',
107
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='7226' ) AS '7226',
108
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='7227' ) AS '7227',
109
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='7228' ) AS '7228',
110
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='7229' ) AS '7229',
111
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2791' ) AS '2791',
112
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2792' ) AS '2792',
113
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2793' ) AS '2793',
114
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2794' ) AS '2794',
115
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2795' ) AS '2795',
116
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2796' ) AS '2796',
117
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2797' ) AS '2797',
118
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2798' ) AS '2798',
119
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='7230' ) AS '7230',
120
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='7231' ) AS '7231',
121
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='7232' ) AS '7232',
122
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='7233' ) AS '7233',
123
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='7234' ) AS '7234',
124
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='7235' ) AS '7235',
125
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='7236' ) AS '7236',
126
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='7237' ) AS '7237',
127
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='7238' ) AS '7238',
128
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2799' ) AS '2799',
129
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2800' ) AS '2800',
130
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2801' ) AS '2801',
131
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2802' ) AS '2802',
132
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2803' ) AS '2803',
133
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2804' ) AS '2804',
134
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2805' ) AS '2805',
135
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2806' ) AS '2806',
136
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2807' ) AS '2807',
137
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='2808' ) AS '2808',
138
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='7239' ) AS '7239',
139
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='7240' ) AS '7240',
140
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='7241' ) AS '7241',
141
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='7242' ) AS '7242',
142
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='7243' ) AS '7243',
143
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='7244' ) AS '7244',
144
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='7245' ) AS '7245',
145
+      (SELECT set_value FROM storage_qualitycheck_son b WHERE a.qualitycheck_id=b.qualitycheck_id AND b.numbering='7246' ) AS '7246'
146
+    FROM storage_qualitycheck_son a
147
+     where a.qualitycheck_id = #{id,jdbcType=INTEGER}
148
+  </select>
91 149
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
92 150
     delete from storage_qualitycheck_son
93 151
     where id = #{id,jdbcType=INTEGER}

+ 83 - 0
src/main/java/com/chinaitop/depot/storage/model/StorageQualitycheckSon.java

@@ -9,6 +9,89 @@ public class StorageQualitycheckSon {
9 9
 
10 10
     private String setValue;
11 11
 
12
+    private String enumid;
13
+    private String enumcode;
14
+    private String enumname;
15
+    private String gbcode;
16
+    private String parentid;
17
+    private String createdate;
18
+    private String remark;
19
+    private String delflag;
20
+    private String children;
21
+
22
+
23
+    public String getEnumid() {
24
+        return enumid;
25
+    }
26
+
27
+    public void setEnumid(String enumid) {
28
+        this.enumid = enumid;
29
+    }
30
+
31
+    public String getEnumcode() {
32
+        return enumcode;
33
+    }
34
+
35
+    public void setEnumcode(String enumcode) {
36
+        this.enumcode = enumcode;
37
+    }
38
+
39
+    public String getEnumname() {
40
+        return enumname;
41
+    }
42
+
43
+    public void setEnumname(String enumname) {
44
+        this.enumname = enumname;
45
+    }
46
+
47
+    public String getGbcode() {
48
+        return gbcode;
49
+    }
50
+
51
+    public void setGbcode(String gbcode) {
52
+        this.gbcode = gbcode;
53
+    }
54
+
55
+    public String getParentid() {
56
+        return parentid;
57
+    }
58
+
59
+    public void setParentid(String parentid) {
60
+        this.parentid = parentid;
61
+    }
62
+
63
+    public String getCreatedate() {
64
+        return createdate;
65
+    }
66
+
67
+    public void setCreatedate(String createdate) {
68
+        this.createdate = createdate;
69
+    }
70
+
71
+    public String getRemark() {
72
+        return remark;
73
+    }
74
+
75
+    public void setRemark(String remark) {
76
+        this.remark = remark;
77
+    }
78
+
79
+    public String getDelflag() {
80
+        return delflag;
81
+    }
82
+
83
+    public void setDelflag(String delflag) {
84
+        this.delflag = delflag;
85
+    }
86
+
87
+    public String getChildren() {
88
+        return children;
89
+    }
90
+
91
+    public void setChildren(String children) {
92
+        this.children = children;
93
+    }
94
+
12 95
     /**
13 96
      * 
14 97
      * @return id 

+ 1 - 2
src/main/java/com/chinaitop/depot/storage/service/StorageQualitycheckService.java

@@ -4,7 +4,6 @@ import com.chinaitop.depot.storage.model.StorageQualitycheck;
4 4
 import com.chinaitop.depot.storage.model.StorageQualitycheckExample;
5 5
 import com.chinaitop.depot.storage.model.StorageQualitycheckSon;
6 6
 
7
-import java.util.HashMap;
8 7
 import java.util.List;
9 8
 import java.util.Map;
10 9
 
@@ -46,7 +45,7 @@ public interface StorageQualitycheckService {
46 45
 	 * @param id
47 46
 	 * @return
48 47
 	 */
49
-	StorageQualitycheck loadDataById(Integer id);
48
+	Map<String, Object> loadDataById(Integer id);
50 49
 
51 50
 	/**
52 51
 	 * 根据主键id删除数据

+ 3 - 0
src/main/java/com/chinaitop/depot/storage/service/StorageQualitycheckSonService.java

@@ -4,6 +4,7 @@ import com.chinaitop.depot.storage.model.StorageQualitycheckSon;
4 4
 import com.chinaitop.depot.storage.model.StorageQualitycheckSonExample;
5 5
 
6 6
 import java.util.List;
7
+import java.util.Map;
7 8
 
8 9
 /**
9 10
  * @author sunhongbing
@@ -30,4 +31,6 @@ public interface StorageQualitycheckSonService {
30 31
      * @return
31 32
      */
32 33
     List<StorageQualitycheckSon> selectByQualitycheckId(Integer id);
34
+
35
+    Map<String, Object> findQualitycheckSon(Integer id);
33 36
 }

+ 56 - 50
src/main/java/com/chinaitop/depot/storage/service/impl/StorageQualitycheckServiceImpl.java

@@ -8,12 +8,12 @@ import com.chinaitop.depot.storage.model.StorageQualitycheckSon;
8 8
 import com.chinaitop.depot.storage.model.StorageQualitycheckSonExample;
9 9
 import com.chinaitop.depot.storage.service.StorageQualitycheckService;
10 10
 import com.chinaitop.depot.storage.service.StorageQualitycheckSonService;
11
-import com.chinaitop.depot.storage.utils.ParameterUtil;
12 11
 import org.apache.commons.lang3.StringUtils;
13 12
 import org.springframework.stereotype.Service;
14 13
 import org.springframework.transaction.annotation.Transactional;
15 14
 
16 15
 import javax.annotation.Resource;
16
+import java.util.HashMap;
17 17
 import java.util.List;
18 18
 import java.util.Map;
19 19
 
@@ -27,6 +27,8 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
27 27
     @Resource
28 28
     private StorageQualitycheckSonService qualitycheckSonService;
29 29
 
30
+
31
+
30 32
     @Override
31 33
 	public List<StorageQualitycheck> queryByQualitycheck(StorageQualitycheck example) {
32 34
 		//对list进行处理获取仓房名称和货位名称
@@ -118,8 +120,9 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
118 120
 	}
119 121
 
120 122
 	@Override
121
-	public StorageQualitycheck loadDataById(Integer id) {
123
+	public Map<String, Object> loadDataById(Integer id) {
122 124
         StorageQualitycheck qualitycheck = null;
125
+        Map<String,Object> retMap = new HashMap<String,Object>();
123 126
 
124 127
         if(id!=null){
125 128
             qualitycheck=qualitycheckMapper.queryPrimaryKey(id);
@@ -127,55 +130,58 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
127 130
             StorageQualitycheckSonExample storageQualitycheckSonExample = new StorageQualitycheckSonExample();
128 131
             StorageQualitycheckSonExample.Criteria criteria = storageQualitycheckSonExample.createCriteria();
129 132
             criteria.andQualitycheckIdEqualTo(id);
130
-            List<StorageQualitycheckSon> qualitycheckSonList = qualitycheckSonService.findQualitycheckSonExample(storageQualitycheckSonExample);
131
-            for(StorageQualitycheckSon sqk : qualitycheckSonList){
132
-                if(sqk.getNumbering()== 6996 ){
133
-                    qualitycheck.setFatIndex(sqk.getSetValue());
134
-                    continue;
135
-                }
136
-                if(sqk.getNumbering() == 6995 ){
137
-                    qualitycheck.setPeroxideValue(sqk.getSetValue());
138
-                    continue;
139
-                }
140
-                if(sqk.getNumbering()== 2789 ){//品尝评分
141
-                    qualitycheck.setEatScore(sqk.getSetValue());
142
-                    continue;
143
-                }
144
-                if(sqk.getNumbering()== 2797 ){//品尝评分
145
-                    qualitycheck.setEatScore(sqk.getSetValue());
146
-                    continue;
147
-                }
148
-                if(sqk.getNumbering() == 2790 ){//面筋吸水量(%)
149
-                    qualitycheck.setGlutenWaterCount(sqk.getSetValue());
150
-                    continue;
151
-                }
152
-                if(sqk.getNumbering() == 2798 ){//脂肪酸值
153
-                    qualitycheck.setFatIndex(sqk.getSetValue());
154
-                    continue;
155
-                }
156
-                if(sqk.getNumbering() == 2788 ){//色泽气味
157
-                    qualitycheck.setColorsmell(sqk.getSetValue());
158
-                    continue;
159
-                }
160
-                if(sqk.getNumbering() == 2796 ){//色泽气味
161
-                    qualitycheck.setColorsmell(sqk.getSetValue());
162
-                    continue;
163
-                }
164
-                if(sqk.getNumbering() == 2795 ){//霉变粒
165
-                    qualitycheck.setMildewCount(sqk.getSetValue());
166
-                    continue;
167
-                }
168
-                if(sqk.getNumbering() == 2801 ){//容重(出糙率%或纯粮率%)
169
-                    qualitycheck.setCapacity(sqk.getSetValue());
170
-                    continue;
171
-                }
172
-                if(sqk.getNumbering() == 2802 ){//不完善粒(整精米率%):
173
-                    qualitycheck.setBadpart(sqk.getSetValue());
174
-                    continue;
175
-                }
176
-            }
133
+            //List<StorageQualitycheckSon> qualitycheckSonList = qualitycheckSonService.findQualitycheckSonExample(storageQualitycheckSonExample);
134
+            Map<String, Object> qualitycheckSon = qualitycheckSonService.findQualitycheckSon(id);
135
+            retMap.put("qualitycheck",qualitycheck);
136
+            retMap.put("qualitycheckSon",qualitycheckSon);
137
+//            for(StorageQualitycheckSon sqk : qualitycheckSonList){
138
+//                if(sqk.getNumbering()== 6996 ){
139
+//                    qualitycheck.setFatIndex(sqk.getSetValue());
140
+//                    continue;
141
+//                }
142
+//                if(sqk.getNumbering() == 6995 ){
143
+//                    qualitycheck.setPeroxideValue(sqk.getSetValue());
144
+//                    continue;
145
+//                }
146
+//                if(sqk.getNumbering()== 2789 ){//品尝评分
147
+//                    qualitycheck.setEatScore(sqk.getSetValue());
148
+//                    continue;
149
+//                }
150
+//                if(sqk.getNumbering()== 2797 ){//品尝评分
151
+//                    qualitycheck.setEatScore(sqk.getSetValue());
152
+//                    continue;
153
+//                }
154
+//                if(sqk.getNumbering() == 2790 ){//面筋吸水量(%)
155
+//                    qualitycheck.setGlutenWaterCount(sqk.getSetValue());
156
+//                    continue;
157
+//                }
158
+//                if(sqk.getNumbering() == 2798 ){//脂肪酸值
159
+//                    qualitycheck.setFatIndex(sqk.getSetValue());
160
+//                    continue;
161
+//                }
162
+//                if(sqk.getNumbering() == 2788 ){//色泽气味
163
+//                    qualitycheck.setColorsmell(sqk.getSetValue());
164
+//                    continue;
165
+//                }
166
+//                if(sqk.getNumbering() == 2796 ){//色泽气味
167
+//                    qualitycheck.setColorsmell(sqk.getSetValue());
168
+//                    continue;
169
+//                }
170
+//                if(sqk.getNumbering() == 2795 ){//霉变粒
171
+//                    qualitycheck.setMildewCount(sqk.getSetValue());
172
+//                    continue;
173
+//                }
174
+//                if(sqk.getNumbering() == 2801 ){//容重(出糙率%或纯粮率%)
175
+//                    qualitycheck.setCapacity(sqk.getSetValue());
176
+//                    continue;
177
+//                }
178
+//                if(sqk.getNumbering() == 2802 ){//不完善粒(整精米率%):
179
+//                    qualitycheck.setBadpart(sqk.getSetValue());
180
+//                    continue;
181
+//                }
182
+//            }
177 183
         }
178
-        return qualitycheck;
184
+        return retMap;
179 185
 	}
180 186
 
181 187
     @Override

+ 5 - 0
src/main/java/com/chinaitop/depot/storage/service/impl/StorageQualitycheckSonServiceImpl.java

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Service;
8 8
 
9 9
 import javax.annotation.Resource;
10 10
 import java.util.List;
11
+import java.util.Map;
11 12
 
12 13
 /**
13 14
  * @author sunhongbing
@@ -21,6 +22,10 @@ public class StorageQualitycheckSonServiceImpl implements StorageQualitycheckSon
21 22
     public List<StorageQualitycheckSon> findQualitycheckSonExample(StorageQualitycheckSonExample storageQualitycheckSonExample) {
22 23
         return qualitycheckSonMapper.selectByExample(storageQualitycheckSonExample);
23 24
     }
25
+    @Override
26
+    public Map<String, Object> findQualitycheckSon(Integer id) {
27
+        return qualitycheckSonMapper.selectsonByExample(id);
28
+    }
24 29
 
25 30
     @Override
26 31
     public void removeSon(StorageQualitycheckSonExample storageQualitycheckSonExample) {