lvzhikai il y a 5 ans
Parent
commit
ae645d07aa
14 fichiers modifiés avec 392 ajouts et 302 suppressions
  1. 39 41
      depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/controller/InsectPestDetectionController.java
  2. 3 1
      depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/mapper/TCcdataMapper.xml
  3. 33 10
      depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/mapper/TCcvalueMapper.xml
  4. 32 7
      depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/model/TCcvalue.java
  5. 132 2
      depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/model/TCcvalueExample.java
  6. 1 1
      depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/service/InsectPestDetectionService.java
  7. 15 2
      depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/service/impl/InsectPestDetectionServiceImpl.java
  8. 9 3
      depot-web/src/main/resources/static/app/intelligent/fumigation/controller/fumigationPlanCtrl.js
  9. 7 10
      depot-web/src/main/resources/static/app/intelligent/fumigation/views/plan/fumigationPlan-edit.html
  10. 92 84
      depot-web/src/main/resources/static/app/intelligent/grainDetection/controller/insectPestDetectionCtrl.js
  11. 0 127
      depot-web/src/main/resources/static/app/intelligent/grainDetection/service/insectPestDetectionService.js
  12. 18 5
      depot-web/src/main/resources/static/app/intelligent/grainDetection/views/insectPestDetection-edit.html
  13. 10 8
      depot-web/src/main/resources/static/app/intelligent/grainDetection/views/insectPestDetection-list.html
  14. 1 1
      depot-web/src/main/resources/static/app/intelligent/module.js

+ 39 - 41
depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/controller/InsectPestDetectionController.java

@@ -237,22 +237,22 @@ public class InsectPestDetectionController {
237 237
         TCcvalue tCcvalue = new TCcvalue();
238 238
         TCcdata tCcdata = new TCcdata();
239 239
 
240
-//        if (jsStr.get("dataId") == null) {
241
-        String orgId = jsStr.get("orgId").toString();
242
-        tCcvalue.setvCfCode(jsStr.get("vCfCode").toString());//仓房code
243
-        tCcvalue.setvCcCode(jsStr.get("vCfCode").toString());//仓房code
244
-        tCcvalue.setOrgId(orgId);//组织机构id
245
-        tCcvalue.setvUpdateTime(ParameterUtil.string2datetime(jsStr.get("vUpdateTime").toString()));//采集时间
240
+        if (jsStr.get("dataId") == null) {
241
+            String orgId = jsStr.get("orgId").toString();
242
+            tCcvalue.setvCfCode(jsStr.get("vCfCode").toString());//仓房code
243
+            tCcvalue.setvCcCode(jsStr.get("vCfCode").toString());//仓房code
244
+            tCcvalue.setOrgId(orgId);//组织机构id
245
+            tCcvalue.setvUpdateTime(ParameterUtil.string2datetime(jsStr.get("vUpdateTime").toString()));//采集时间
246 246
 
247
-        //害虫检测单号
248
-        Map<String,Object> map = new HashMap<String, Object>();
249
-        map.put("orgId", orgId);
250
-        map.put("vcfcode", jsStr.get("vCfCode").toString());
251
-        map.put("updateTime", ParameterUtil.string2datetime(jsStr.get("vUpdateTime").toString()));
252
-        List<Map<String,Object>> jcdList = insectPestDetectionService.getJcd(map);
253
-        String jcd = ObjectUtils.toString(jcdList.get(0).get("jcd"));
254
-        tCcvalue.setHcjcdh(jcd);
255
-        tCcvalue.setId(uuidUtils.getCode());//唯一id
247
+            //害虫检测单号
248
+            Map<String,Object> map = new HashMap<String, Object>();
249
+            map.put("orgId", orgId);
250
+            map.put("vcfcode", jsStr.get("vCfCode").toString());
251
+            map.put("updateTime", ParameterUtil.string2datetime(jsStr.get("vUpdateTime").toString()));
252
+            List<Map<String,Object>> jcdList = insectPestDetectionService.getJcd(map);
253
+            String jcd = ObjectUtils.toString(jcdList.get(0).get("jcd"));
254
+            tCcvalue.setHcjcdh(jcd);
255
+            tCcvalue.setId(UuidUtils.getCode());//唯一id
256 256
 
257 257
             tCcdata.setOrgId(orgId);//组织机构id
258 258
             tCcdata.setvHwCode(jsStr.get("vHwCode").toString());//货位code
@@ -266,39 +266,37 @@ public class InsectPestDetectionController {
266 266
             tCcdata.setCldjpd(jsStr.get("cldjpd")==null ? "":jsStr.get("cldjpd").toString());//虫粮等级判定
267 267
             tCcdata.setHckyxfx(jsStr.get("hckyxfx")==null ? "":jsStr.get("hckyxfx").toString());//害虫抗药性分析
268 268
             tCcdata.setvUpdatePeople(jsStr.get("vUpdatePeople").toString());//检测人
269
-            tCcdata.setId(uuidUtils.getCode());//唯一id
269
+            tCcdata.setId(UuidUtils.getCode());//唯一id
270 270
             tCcdata.setDataSource("1");//数据来源0是自动检测,1是手工录入
271 271
             tCcdata.setJchcff("0");
272 272
             insectPestDetectionService.add(tCcdata, tCcvalue);//熏蒸计划
273
-//        } else {
274
-//            tCcvalue.setvCfCode(jsStr.get("vCfCode").toString());//仓房code
275
-//            tCcvalue.setvUpdateTime(ParameterUtil.string2date(jsStr.get("vUpdateTime").toString()));//采集时间
276
-//            tCcvalue.setId(jsStr.get("id").toString());
277
-//
278
-//            tCcdata.setvHwCode(jsStr.get("vHwCode").toString());//货位code
279
-//            tCcdata.setStandOr(jsStr.get("standOr").toString());//扦养人
280
-//            tCcdata.setStandTime(ParameterUtil.string2date(jsStr.get("standTime").toString()));//扦养时间
281
-//            tCcdata.setHczl(jsStr.get("hczl").toString());//害虫种类
282
-//            tCcdata.setiValue(Integer.parseInt(jsStr.get("iValue").toString()));//数量
283
-//            tCcdata.setvUpdateTime(ParameterUtil.string2date(jsStr.get("vUpdateTime").toString()));//监测时间
284
-//            tCcdata.setvUpdatePeople(jsStr.get("vUpdatePeople").toString());//检测人
285
-//            insectPestDetectionService.update(tCcdata, tCcvalue);
286
-//        }
273
+        } else {
274
+            tCcvalue.setvUpdateTime(ParameterUtil.string2datetime(jsStr.get("vUpdateTime").toString()));//采集时间
275
+            tCcvalue.setId(jsStr.get("valueId").toString());
276
+
277
+            tCcdata.setStandOr(jsStr.get("standOr")==null ? "":jsStr.get("standOr").toString());//扦养人
278
+            tCcdata.setStandTime(ParameterUtil.string2datetime(jsStr.get("standTime").toString()));//扦养时间
279
+            tCcdata.setHczl(jsStr.get("hczl").toString());//害虫种类
280
+            tCcdata.setiValue(Integer.parseInt(jsStr.get("iValue").toString()));//数量
281
+            tCcdata.setvUpdateTime(ParameterUtil.string2datetime(jsStr.get("vUpdateTime").toString()));//监测时间
282
+            tCcdata.setJchcff(jsStr.get("jchcff")==null ? "":jsStr.get("jchcff").toString());//检查害虫方法
283
+            tCcdata.setCldjpd(jsStr.get("cldjpd")==null ? "":jsStr.get("cldjpd").toString());//虫粮等级判定
284
+            tCcdata.setHckyxfx(jsStr.get("hckyxfx")==null ? "":jsStr.get("hckyxfx").toString());//害虫抗药性分析
285
+            tCcdata.setvUpdatePeople(jsStr.get("vUpdatePeople").toString());//检测人
286
+            tCcdata.setId(jsStr.get("dataId").toString());
287
+            insectPestDetectionService.update(tCcdata, tCcvalue);
288
+        }
287 289
         return ResponseEntity.ok(modelMap);
288 290
     }
289 291
 
290
-
291
-    @RequestMapping(value = "/getInsectPestDeatil", method = RequestMethod.POST)
292
-    @ApiOperation(value = "修改虫害单仓手工录入数据", notes = "修改虫害单仓手工录入数据")
292
+    @RequestMapping(value = "/getInsectPestEdit", method = RequestMethod.POST)
293
+    @ApiOperation(value = "查询虫害详情", notes = "查询虫害详情")
293 294
     @ApiImplicitParams({
294
-            @ApiImplicitParam(name = "insectPestId", value = "虫害检测id", paramType = "query")
295
+            @ApiImplicitParam(name = "dataId", value = "详情表id", paramType = "query"),
296
+            @ApiImplicitParam(name = "valueId", value = "害虫检测单号表id", paramType = "query")
295 297
     })
296
-    public ResponseEntity getInsectPestDeatil(String insectPestId) {
297
-        TCcdata tCcdata = new TCcdata();
298
-        TCcdataExample example = new TCcdataExample();
299
-        TCcdataExample.Criteria criteria = example.createCriteria();
300
-        criteria.andIdEqualTo(insectPestId);
301
-        List<TCcdata> tccdataList = insectPestDetectionService.getInsectPestDeatil(example);
302
-        return ResponseEntity.ok(tccdataList);
298
+    public ResponseEntity getInsectPestEdit(String dataId,String valueId) {
299
+        Map<String, Object> modelMap = insectPestDetectionService.getInsectPestEdit(dataId,valueId);
300
+        return ResponseEntity.ok(modelMap);
303 301
     }
304 302
 }

+ 3 - 1
depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/mapper/TCcdataMapper.xml

@@ -396,7 +396,9 @@
396 396
     td.i_value AS iValue,
397 397
     td.v_update_people AS vUpdatePeople,
398 398
     td.v_update_time AS vUpdateTime,
399
-    tv.hcjcdh AS hcjcdh
399
+    tv.hcjcdh AS hcjcdh,
400
+    td.id AS dataId,
401
+    tv.id AS valueId
400 402
     FROM
401 403
     t_ccdata td
402 404
     LEFT JOIN t_ccvalue tv ON td.v_update_time = tv.v_update_time

+ 33 - 10
depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/mapper/TCcvalueMapper.xml

@@ -12,6 +12,8 @@
12 12
     <result column="v_avg" property="vAvg" jdbcType="DECIMAL" />
13 13
     <result column="v_update_time" property="vUpdateTime" jdbcType="TIMESTAMP" />
14 14
     <result column="data_source" property="dataSource" jdbcType="VARCHAR" />
15
+    <result column="updatetime" property="updatetime" jdbcType="TIMESTAMP" />
16
+    <result column="hcjcdh" property="hcjcdh" jdbcType="VARCHAR" />
15 17
   </resultMap>
16 18
   <sql id="Example_Where_Clause" >
17 19
     <where >
@@ -73,7 +75,7 @@
73 75
   </sql>
74 76
   <sql id="Base_Column_List" >
75 77
     id, org_id, v_cc_code, z_zd_code, v_cf_code, v_max, v_min, v_avg, v_update_time, 
76
-    data_source
78
+    data_source, updatetime, hcjcdh
77 79
   </sql>
78 80
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.intelligent.grainsituation.model.TCcvalueExample" >
79 81
     select
@@ -99,11 +101,13 @@
99 101
     insert into t_ccvalue (id, org_id, v_cc_code, 
100 102
       z_zd_code, v_cf_code, v_max, 
101 103
       v_min, v_avg, v_update_time, 
102
-      data_source,hcjcdh)
104
+      data_source, updatetime, hcjcdh
105
+      )
103 106
     values (#{id,jdbcType=VARCHAR}, #{orgId,jdbcType=VARCHAR}, #{vCcCode,jdbcType=VARCHAR}, 
104 107
       #{zZdCode,jdbcType=VARCHAR}, #{vCfCode,jdbcType=VARCHAR}, #{vMax,jdbcType=INTEGER}, 
105 108
       #{vMin,jdbcType=INTEGER}, #{vAvg,jdbcType=DECIMAL}, #{vUpdateTime,jdbcType=TIMESTAMP}, 
106
-      #{dataSource,jdbcType=VARCHAR}, #{hcjcdh,jdbcType=VARCHAR})
109
+      #{dataSource,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP}, #{hcjcdh,jdbcType=VARCHAR}
110
+      )
107 111
   </insert>
108 112
   <insert id="insertSelective" parameterType="com.chinaitop.depot.intelligent.grainsituation.model.TCcvalue" >
109 113
     insert into t_ccvalue
@@ -138,6 +142,12 @@
138 142
       <if test="dataSource != null" >
139 143
         data_source,
140 144
       </if>
145
+      <if test="updatetime != null" >
146
+        updatetime,
147
+      </if>
148
+      <if test="hcjcdh != null" >
149
+        hcjcdh,
150
+      </if>
141 151
     </trim>
142 152
     <trim prefix="values (" suffix=")" suffixOverrides="," >
143 153
       <if test="id != null" >
@@ -170,6 +180,12 @@
170 180
       <if test="dataSource != null" >
171 181
         #{dataSource,jdbcType=VARCHAR},
172 182
       </if>
183
+      <if test="updatetime != null" >
184
+        #{updatetime,jdbcType=TIMESTAMP},
185
+      </if>
186
+      <if test="hcjcdh != null" >
187
+        #{hcjcdh,jdbcType=VARCHAR},
188
+      </if>
173 189
     </trim>
174 190
   </insert>
175 191
   <select id="countByExample" parameterType="com.chinaitop.depot.intelligent.grainsituation.model.TCcvalueExample" resultType="java.lang.Integer" >
@@ -211,6 +227,12 @@
211 227
       <if test="record.dataSource != null" >
212 228
         data_source = #{record.dataSource,jdbcType=VARCHAR},
213 229
       </if>
230
+      <if test="record.updatetime != null" >
231
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
232
+      </if>
233
+      <if test="record.hcjcdh != null" >
234
+        hcjcdh = #{record.hcjcdh,jdbcType=VARCHAR},
235
+      </if>
214 236
     </set>
215 237
     <if test="_parameter != null" >
216 238
       <include refid="Update_By_Example_Where_Clause" />
@@ -227,7 +249,9 @@
227 249
       v_min = #{record.vMin,jdbcType=INTEGER},
228 250
       v_avg = #{record.vAvg,jdbcType=DECIMAL},
229 251
       v_update_time = #{record.vUpdateTime,jdbcType=TIMESTAMP},
230
-      data_source = #{record.dataSource,jdbcType=VARCHAR}
252
+      data_source = #{record.dataSource,jdbcType=VARCHAR},
253
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
254
+      hcjcdh = #{record.hcjcdh,jdbcType=VARCHAR}
231 255
     <if test="_parameter != null" >
232 256
       <include refid="Update_By_Example_Where_Clause" />
233 257
     </if>
@@ -308,17 +332,16 @@
308 332
     GROUP BY v_update_time
309 333
     ORDER BY v_update_time DESC LIMIT 0,1
310 334
   </select>
311
-  
335
+
312 336
   <select id="getJcd" parameterType="java.util.Map" resultType="java.util.Map">
313
-  	SELECT
314
-		concat(credit_code,LPAD(org_id, 3, 0),LPAD(#{vcfcode}, 4, 0),DATE_FORMAT(STR_TO_DATE(#{updateTime},'%Y-%m-%d %H:%i:%s'),'%Y%m%d%H%i'),'00000') jcd
315
-	FROM
316
-		org_info
337
+    SELECT
338
+    concat(credit_code,LPAD(org_id, 3, 0),LPAD(#{vcfcode}, 4, 0),DATE_FORMAT(STR_TO_DATE(#{updateTime},'%Y-%m-%d %H:%i:%s'),'%Y%m%d%H%i'),'00000') jcd
339
+    FROM
340
+    org_info
317 341
     <where>
318 342
       <if test="orgId != null">
319 343
         org_id = #{orgId}
320 344
       </if>
321 345
     </where>
322 346
   </select>
323
-
324 347
 </mapper>

+ 32 - 7
depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/model/TCcvalue.java

@@ -24,6 +24,8 @@ public class TCcvalue {
24 24
 
25 25
     private String dataSource;
26 26
 
27
+    private Date updatetime;
28
+
27 29
     private String hcjcdh;
28 30
 
29 31
     /**
@@ -186,12 +188,35 @@ public class TCcvalue {
186 188
         this.dataSource = dataSource == null ? null : dataSource.trim();
187 189
     }
188 190
 
189
-	public String getHcjcdh() {
190
-		return hcjcdh;
191
-	}
191
+    /**
192
+     * 
193
+     * @return updatetime 
194
+     */
195
+    public Date getUpdatetime() {
196
+        return updatetime;
197
+    }
192 198
 
193
-	public void setHcjcdh(String hcjcdh) {
194
-		this.hcjcdh = hcjcdh == null ? null : hcjcdh.trim();
195
-	}
196
-	
199
+    /**
200
+     * 
201
+     * @param updatetime 
202
+     */
203
+    public void setUpdatetime(Date updatetime) {
204
+        this.updatetime = updatetime;
205
+    }
206
+
207
+    /**
208
+     * 害虫检查单号
209
+     * @return hcjcdh 害虫检查单号
210
+     */
211
+    public String getHcjcdh() {
212
+        return hcjcdh;
213
+    }
214
+
215
+    /**
216
+     * 害虫检查单号
217
+     * @param hcjcdh 害虫检查单号
218
+     */
219
+    public void setHcjcdh(String hcjcdh) {
220
+        this.hcjcdh = hcjcdh == null ? null : hcjcdh.trim();
221
+    }
197 222
 }

+ 132 - 2
depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/model/TCcvalueExample.java

@@ -75,7 +75,7 @@ public class TCcvalueExample {
75 75
     }
76 76
 
77 77
     /**
78
-     * t_ccvalue 2019-03-07
78
+     * t_ccvalue 2020-12-07
79 79
      */
80 80
     protected abstract static class GeneratedCriteria {
81 81
         protected List<Criterion> criteria;
@@ -777,6 +777,136 @@ public class TCcvalueExample {
777 777
             addCriterion("data_source not between", value1, value2, "dataSource");
778 778
             return (Criteria) this;
779 779
         }
780
+
781
+        public Criteria andUpdatetimeIsNull() {
782
+            addCriterion("updatetime is null");
783
+            return (Criteria) this;
784
+        }
785
+
786
+        public Criteria andUpdatetimeIsNotNull() {
787
+            addCriterion("updatetime is not null");
788
+            return (Criteria) this;
789
+        }
790
+
791
+        public Criteria andUpdatetimeEqualTo(Date value) {
792
+            addCriterion("updatetime =", value, "updatetime");
793
+            return (Criteria) this;
794
+        }
795
+
796
+        public Criteria andUpdatetimeNotEqualTo(Date value) {
797
+            addCriterion("updatetime <>", value, "updatetime");
798
+            return (Criteria) this;
799
+        }
800
+
801
+        public Criteria andUpdatetimeGreaterThan(Date value) {
802
+            addCriterion("updatetime >", value, "updatetime");
803
+            return (Criteria) this;
804
+        }
805
+
806
+        public Criteria andUpdatetimeGreaterThanOrEqualTo(Date value) {
807
+            addCriterion("updatetime >=", value, "updatetime");
808
+            return (Criteria) this;
809
+        }
810
+
811
+        public Criteria andUpdatetimeLessThan(Date value) {
812
+            addCriterion("updatetime <", value, "updatetime");
813
+            return (Criteria) this;
814
+        }
815
+
816
+        public Criteria andUpdatetimeLessThanOrEqualTo(Date value) {
817
+            addCriterion("updatetime <=", value, "updatetime");
818
+            return (Criteria) this;
819
+        }
820
+
821
+        public Criteria andUpdatetimeIn(List<Date> values) {
822
+            addCriterion("updatetime in", values, "updatetime");
823
+            return (Criteria) this;
824
+        }
825
+
826
+        public Criteria andUpdatetimeNotIn(List<Date> values) {
827
+            addCriterion("updatetime not in", values, "updatetime");
828
+            return (Criteria) this;
829
+        }
830
+
831
+        public Criteria andUpdatetimeBetween(Date value1, Date value2) {
832
+            addCriterion("updatetime between", value1, value2, "updatetime");
833
+            return (Criteria) this;
834
+        }
835
+
836
+        public Criteria andUpdatetimeNotBetween(Date value1, Date value2) {
837
+            addCriterion("updatetime not between", value1, value2, "updatetime");
838
+            return (Criteria) this;
839
+        }
840
+
841
+        public Criteria andHcjcdhIsNull() {
842
+            addCriterion("hcjcdh is null");
843
+            return (Criteria) this;
844
+        }
845
+
846
+        public Criteria andHcjcdhIsNotNull() {
847
+            addCriterion("hcjcdh is not null");
848
+            return (Criteria) this;
849
+        }
850
+
851
+        public Criteria andHcjcdhEqualTo(String value) {
852
+            addCriterion("hcjcdh =", value, "hcjcdh");
853
+            return (Criteria) this;
854
+        }
855
+
856
+        public Criteria andHcjcdhNotEqualTo(String value) {
857
+            addCriterion("hcjcdh <>", value, "hcjcdh");
858
+            return (Criteria) this;
859
+        }
860
+
861
+        public Criteria andHcjcdhGreaterThan(String value) {
862
+            addCriterion("hcjcdh >", value, "hcjcdh");
863
+            return (Criteria) this;
864
+        }
865
+
866
+        public Criteria andHcjcdhGreaterThanOrEqualTo(String value) {
867
+            addCriterion("hcjcdh >=", value, "hcjcdh");
868
+            return (Criteria) this;
869
+        }
870
+
871
+        public Criteria andHcjcdhLessThan(String value) {
872
+            addCriterion("hcjcdh <", value, "hcjcdh");
873
+            return (Criteria) this;
874
+        }
875
+
876
+        public Criteria andHcjcdhLessThanOrEqualTo(String value) {
877
+            addCriterion("hcjcdh <=", value, "hcjcdh");
878
+            return (Criteria) this;
879
+        }
880
+
881
+        public Criteria andHcjcdhLike(String value) {
882
+            addCriterion("hcjcdh like", value, "hcjcdh");
883
+            return (Criteria) this;
884
+        }
885
+
886
+        public Criteria andHcjcdhNotLike(String value) {
887
+            addCriterion("hcjcdh not like", value, "hcjcdh");
888
+            return (Criteria) this;
889
+        }
890
+
891
+        public Criteria andHcjcdhIn(List<String> values) {
892
+            addCriterion("hcjcdh in", values, "hcjcdh");
893
+            return (Criteria) this;
894
+        }
895
+
896
+        public Criteria andHcjcdhNotIn(List<String> values) {
897
+            addCriterion("hcjcdh not in", values, "hcjcdh");
898
+            return (Criteria) this;
899
+        }
900
+
901
+        public Criteria andHcjcdhBetween(String value1, String value2) {
902
+            addCriterion("hcjcdh between", value1, value2, "hcjcdh");
903
+            return (Criteria) this;
904
+        }
905
+
906
+        public Criteria andHcjcdhNotBetween(String value1, String value2) {
907
+            addCriterion("hcjcdh not between", value1, value2, "hcjcdh");
908
+            return (Criteria) this;
909
+        }
780 910
     }
781 911
 
782 912
     /**
@@ -790,7 +920,7 @@ public class TCcvalueExample {
790 920
     }
791 921
 
792 922
     /**
793
-     * t_ccvalue 2019-03-07
923
+     * t_ccvalue 2020-12-07
794 924
      */
795 925
     public static class Criterion {
796 926
         private String condition;

+ 1 - 1
depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/service/InsectPestDetectionService.java

@@ -61,5 +61,5 @@ public interface InsectPestDetectionService {
61 61
 
62 62
     void update(TCcdata tCcdata,TCcvalue tCcvalue);
63 63
 
64
-    List<TCcdata> getInsectPestDeatil(TCcdataExample example);
64
+    Map<String, Object> getInsectPestEdit(String dataId,String valueId);
65 65
 }

+ 15 - 2
depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/service/impl/InsectPestDetectionServiceImpl.java

@@ -199,7 +199,20 @@ public class InsectPestDetectionServiceImpl implements InsectPestDetectionServic
199 199
     }
200 200
 
201 201
     @Override
202
-    public List<TCcdata> getInsectPestDeatil(TCcdataExample example) {
203
-        return tCcdataMapper.selectByExample(example);
202
+    public Map<String, Object> getInsectPestEdit(String dataId,String valueId) {
203
+        TCcdataExample example = new TCcdataExample();
204
+        TCcdataExample.Criteria criteria = example.createCriteria();
205
+        criteria.andIdEqualTo(dataId);
206
+        List<TCcdata> tccDataList = tCcdataMapper.selectByExample(example);
207
+
208
+        TCcvalueExample tCcvalueExample = new TCcvalueExample();
209
+        TCcvalueExample.Criteria criteria1 = tCcvalueExample.createCriteria();
210
+        criteria1.andIdEqualTo(valueId);
211
+        List<TCcvalue> tccValueList = tCcvalueMapper.selectByExample(tCcvalueExample);
212
+
213
+        Map<String, Object> map = new HashMap<>();
214
+        map.put("tccDataList",tccDataList.get(0));
215
+        map.put("tccValueList",tccValueList.get(0));
216
+        return map;
204 217
     }
205 218
 }

+ 9 - 3
depot-web/src/main/resources/static/app/intelligent/fumigation/controller/fumigationPlanCtrl.js

@@ -267,11 +267,14 @@ angular.module('app.intelligent')
267 267
         
268 268
         //通过仓房获取害虫检查单号
269 269
         fumigationPlanService.getJcd(houseId,$stateParams.fumigationId).then(function(data){
270
-        	$scope.jcdList = data;
270
+            if(data.length > 0){
271
+                $scope.fumigation.hcjcdh = data[0].hcjcdh;
272
+            }else{
273
+                $scope.fumigation.hcjcdh = null;
274
+            }
271 275
         },function(data){
272 276
         	console.log(data);
273 277
         });
274
-        
275 278
     };
276 279
 
277 280
     // 置空根据houseId获取的数据.
@@ -574,7 +577,10 @@ angular.module('app.intelligent')
574 577
 
575 578
     // 审批菜单中选择审批人后通过、驳回、拒绝.
576 579
     $scope.audit = function (fumigation, result, content, state) {
577
-        if(state == '0' || state == '6'){
580
+        if(state == '6'){
581
+            state = '7'
582
+        }
583
+        if(state == '0' || state == '7'){
578 584
             if(null == content || content == 'undefined'){
579 585
                 alert("请填写审批意见!");
580 586
                 return ;

+ 7 - 10
depot-web/src/main/resources/static/app/intelligent/fumigation/views/plan/fumigationPlan-edit.html

@@ -16,7 +16,7 @@
16 16
 									<span class="pull-right font-xs">带*的部分必须填写</span>
17 17
 								</header>
18 18
                                 <fieldset>
19
-                                
19
+
20 20
                                 <table style="width:70%; border-width:5px; margin-left:15%;position:relative;margin-right:15%;">
21 21
                                 	<table class="table table-striped table-bordered table-hover" width="100%" style="padding: 0;" >
22 22
                                 		<!--第一个tr开始 -->
@@ -29,7 +29,7 @@
29 29
 											</th>
30 30
 											<th width='15%'>
31 31
 												<section >
32
-			                                        <label class="input"> 
32
+			                                        <label class="input">
33 33
 			                                            <input class="form-control" type="text" ng-model="orgName"
34 34
 			                                            ng-readonly="true" ng-init="orgName = depotInfo.orgName">
35 35
 			                                        </label>
@@ -54,7 +54,7 @@
54 54
 											</th>
55 55
 											<th width='15%'>
56 56
 												<section>
57
-		                                            <label class="select"> 
57
+		                                            <label class="select">
58 58
 		                                                <select ng-model="storehouse.houseType" name="houseType" ng-disabled="true"
59 59
 		                                                ng-options="enum.enumid as enum.enumname for enum in dicDataList[1064]">
60 60
 		                                                	<option value="">--请选择--</option>
@@ -196,11 +196,8 @@
196 196
 											</th>
197 197
 											<th>
198 198
 												<section>
199
-													<label class="select">
200
-														<select ng-model="fumigation.hcjcdh" name="hcjcd" required class="form-control"
201
-															ng-options="store.hcjcdh as store.hcjcdh for store in jcdList">
202
-															<option value="">--请选择--</option>
203
-														</select>
199
+													<label class="input">
200
+														<input class="form-control" type="text" ng-model="fumigation.hcjcdh" name="hcjcdh" disabled>
204 201
 													</label>
205 202
 												</section>
206 203
 											</th>
@@ -422,7 +419,7 @@
422 419
 												</section>
423 420
 											</th>
424 421
 											<th>
425
-												<label label class="label" style="margin-top: 9px;text-align: center;">施药方法</label>
422
+												<label label class="label" style="margin-top: 9px;text-align: center;">施药方法<span style="color: red;">*</span></label>
426 423
 											</th>
427 424
 											<th>
428 425
 												<section>
@@ -468,7 +465,7 @@
468 465
 												</section>
469 466
 											</th>
470 467
 											<th>
471
-												<label label class="label" style="margin-top: 9px;text-align: center;">环流熏蒸方式</label>
468
+												<label label class="label" style="margin-top: 9px;text-align: center;">环流熏蒸方式<span style="color: red;">*</span></label>
472 469
 											</th>
473 470
 											<th>
474 471
 												<section>

+ 92 - 84
depot-web/src/main/resources/static/app/intelligent/grainDetection/controller/insectPestDetectionCtrl.js

@@ -23,9 +23,9 @@ angular.module('app.intelligent').controller("insectPestDetectionCtrl", function
23 23
     };
24 24
     $scope.loadData();
25 25
 
26
-    // 新增页面
27
-    $scope.showAdd = function() {
28
-        $state.go("app.intelligent.grainDetection.insectPestDetectionEdit");
26
+    // 新增/修改/查看页面
27
+    $scope.showUpdate = function(insetType,dataId,valueId) {
28
+        $state.go("app.intelligent.grainDetection.insectPestDetectionEdit",{insetType:insetType,dataId:dataId,valueId:valueId});
29 29
     };
30 30
 
31 31
     // 获取所有仓房code
@@ -239,90 +239,98 @@ angular.module('app.intelligent').controller("insectPestDetectionCtrl", function
239 239
         }
240 240
     };
241 241
 })
242
-    // 虫害手工录入
243
-    .controller("insectPestEditCtrl", function($scope, $filter, $http, $stateParams, $state, $rootScope, $uibModal, insectPestDetectionService,
244
-                                               warehouseService) {
242
+// 虫害手工录入
243
+.controller("insectPestEditCtrl", function($scope, $filter, $http, $stateParams, $state, $rootScope, $uibModal, insectPestDetectionService,
244
+                                           warehouseService) {
245
+
246
+    $scope.insectPests = {};
247
+    $scope.saveFlag = false;
248
+    $scope.SFUpdate = false;
249
+
250
+    $scope.loadDataById = function(dataId,valueId) {
251
+        insectPestDetectionService.getInsectPestEdit(dataId,valueId).then(function(data){
252
+            $scope.insectPests = data.data.tccDataList;
253
+            $scope.houseId = Number($rootScope.storeHouseCodeObj[data.data.tccDataList.vCcCode].storehouseId);
254
+            $scope.loadWare($scope.houseId);
255
+            $scope.insectPests.vHwCode = Number(data.data.tccDataList.vHwCode);
256
+            $scope.insectPests.hczl = Number(data.data.tccDataList.hczl);
257
+            $scope.insectPests.hcjcdh = data.data.tccValueList.hcjcdh;
258
+            $scope.insectPests.vUpdateTime = data.data.tccValueList.vUpdateTime;
259
+            $scope.insectPests.valueId = valueId;
260
+            $scope.insectPests.dataId = dataId;
261
+        },function(data){
262
+            console.log(data);
263
+        });
264
+    };
245 265
 
246
-        $scope.insectPests = {};
247
-        $scope.saveFlag = false;
248
-        $scope.insectPests.vUpdatePeople = $rootScope.userInfo.username;
266
+    if ($stateParams.insetType == "add") {//新增
267
+        $scope.insectPests.vUpdatePeople = $rootScope.userInfo.realName;
249 268
         $scope.insectPests.orgId = $rootScope.depotInfo.orgId;
269
+    }else if($stateParams.insetType == "detail"){//详情
270
+        $scope.isNotSave = true;
271
+        $("#insectPests-form input").attr("disabled",true);
272
+        $("#insectPests-form select").attr("disabled",true);
273
+        $scope.loadDataById($stateParams.dataId,$stateParams.valueId);
274
+    }else if($stateParams.insetType == "edit"){//修改
275
+        $scope.SFUpdate = true;
276
+        $("#insectPests-form input").attr("disabled",false);
277
+        $("#insectPests-form select").attr("disabled",false);
278
+        $scope.loadDataById($stateParams.dataId,$stateParams.valueId);
279
+    }
250 280
 
251
-        $scope.loadDataById = function(id) {
252
-            insectPestDetectionService.getFumigationPlanDeatil(id).then(function(data){
253
-                $scope.insectPests = data.fumigationEdit;
254
-            },function(data){
255
-                console.log(data);
256
-            });
257
-        };
258
-
259
-        if ($stateParams.fumType == "add") {//新增
260
-            $scope.insectPests.vUpdatePeople = $rootScope.userInfo.userId;
261
-            $scope.insectPests.orgId = $rootScope.depotInfo.orgId;
262
-        }else if($stateParams.fumType == "detail"){//详情
263
-            $scope.isNotSave = true;
264
-            $("#fumigationPlan-form input").attr("disabled",true);
265
-            $("#fumigationPlan-form select").attr("disabled",true);
266
-            $scope.loadDataById($stateParams.fumigationId);
267
-        }else if($stateParams.fumType == "edit"){//修改
268
-            $("#fumigationPlan-form input").attr("disabled",false);
269
-            $("#fumigationPlan-form select").attr("disabled",false);
270
-            $scope.loadDataById($stateParams.fumigationId);
271
-        }
281
+    var validator = $("#insectPests-form").validate();
272 282
 
273
-        var validator = $("#insectPests-form").validate();
274
-
275
-        // 自定义验证,验证熏蒸次数
276
-        $.validator.addMethod("validFrequency",function(value,element, params) {
277
-            var checkNumber = /^\+?[1-9]\d*$/;
278
-            return this.optional(element)||(checkNumber.test(value));
279
-        },"请输入大于0的整数!");
280
-
281
-        // 货位列表
282
-        $scope.loadWare = function(houseId) {
283
-            $scope.insectPests.vCfCode = $rootScope.storehouseObj[houseId].storehouseCode;
284
-            warehouseService.getStorehouse($rootScope.orgInfo.orgId, houseId).then(function(data){
285
-                $scope.warelist = data.wareList;
286
-            },function(data){
287
-                console.log(data);
288
-            });
289
-        };
290
-
291
-        // 返回.
292
-        $scope.retList = function () {
293
-            $rootScope.back();
294
-        };
295
-
296
-        // 保存.
297
-        $scope.saveData = function () {
298
-            if (!$scope.saveFlag) {
299
-                if (validator.form()) {
300
-                    // 设置saveFlag为true,防止重复提交.
301
-                    $scope.saveFlag = true;
302
-                    $("input[name='vUpdateTime']").each(function(j,item){
303
-                        if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
304
-                            $scope.insectPests.vUpdateTime = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
305
-                        }
306
-                    });
307
-                    $("input[name='standTime']").each(function(j,item){
308
-                        if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
309
-                            $scope.insectPests.standTime = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
310
-                        }
311
-                    });
312
-
313
-                    //保存熏蒸数据
314
-                    insectPestDetectionService.saveInsectPestDate($scope.insectPests).then(function(data){
315
-                        if(data.message == "success"){
316
-                            alert("保存成功!");
317
-                            $scope.retList();
318
-                        } else {
319
-                            alert("保存失败!");
320
-                            $scope.saveFlag = false;
321
-                        }
322
-                    },function(data){
323
-                        console.log(data);
324
-                    });
325
-                }
283
+    // 自定义验证,验证熏蒸次数
284
+    $.validator.addMethod("validFrequency",function(value,element, params) {
285
+        var checkNumber = /^\+?[1-9]\d*$/;
286
+        return this.optional(element)||(checkNumber.test(value));
287
+    },"请输入大于0的整数!");
288
+
289
+    // 货位列表
290
+    $scope.loadWare = function(houseId) {
291
+        $scope.insectPests.vCfCode = $rootScope.storehouseObj[houseId].storehouseCode;
292
+        warehouseService.getStorehouse($rootScope.orgInfo.orgId, houseId).then(function(data){
293
+            $scope.warelist = data.wareList;
294
+        },function(data){
295
+            console.log(data);
296
+        });
297
+    };
298
+
299
+    // 返回.
300
+    $scope.retList = function () {
301
+        $rootScope.back();
302
+    };
303
+
304
+    // 保存.
305
+    $scope.saveData = function () {
306
+        if (!$scope.saveFlag) {
307
+            if (validator.form()) {
308
+                // 设置saveFlag为true,防止重复提交.
309
+                $scope.saveFlag = true;
310
+                $("input[name='vUpdateTime']").each(function(j,item){
311
+                    if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
312
+                        $scope.insectPests.vUpdateTime = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
313
+                    }
314
+                });
315
+                $("input[name='standTime']").each(function(j,item){
316
+                    if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
317
+                        $scope.insectPests.standTime = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
318
+                    }
319
+                });
320
+
321
+                //保存熏蒸数据
322
+                insectPestDetectionService.saveInsectPestDate($scope.insectPests).then(function(data){
323
+                    if(data.message == "success"){
324
+                        alert("保存成功!");
325
+                        $scope.retList();
326
+                    } else {
327
+                        alert("保存失败!");
328
+                        $scope.saveFlag = false;
329
+                    }
330
+                },function(data){
331
+                    console.log(data);
332
+                });
326 333
             }
327 334
         }
328
-    })
335
+    }
336
+})

+ 0 - 127
depot-web/src/main/resources/static/app/intelligent/grainDetection/service/insectPestDetectionService.js

@@ -1,127 +0,0 @@
1
-"use strict";
2
-angular.module('app.intelligent').service("insectPestDetectionService", function($http, $q, APP_CONFIG, $rootScope) {
3
-
4
-    // 分页列表数据
5
-    this.getInsectPestDetectionPageInfo = function (pageInfo,search) {
6
-        var orgId = $rootScope.orgInfo.orgId;
7
-        var d = $q.defer();
8
-        $http({
9
-            method : 'GET',
10
-            url : APP_CONFIG.intelligentUrl + '/intelligents/insectPestDetection/getList',
11
-            params : {
12
-                pageNum : pageInfo.pageNum,
13
-                pageSize : pageInfo.pageSize,
14
-                vCfCode : search == undefined ? "":search.vCfCode,
15
-                iBeginTdh : search == undefined ? "":search.iBeginTdh,
16
-                iEndTdh : search == undefined ? "":search.iEndTdh,
17
-                orgId : orgId
18
-            }
19
-        }).then(function successCallback(response) {
20
-            // 请求成功执行代码
21
-            d.resolve(response.data);
22
-        }, function errorCallback(response) {
23
-            // 请求失败执行代码
24
-            d.reject("error");
25
-        });
26
-        return d.promise;
27
-    };
28
-
29
-    // 查询图表数据
30
-    this.getByCfCode = function (search) {
31
-        var d = $q.defer();
32
-        $http({
33
-            method : 'GET',
34
-            url : APP_CONFIG.intelligentUrl + '/intelligents/insectPestDetection/getByCfCode',
35
-            params : {
36
-                vCfCode : search == undefined ? "":search.vCfCode,
37
-                searchStartDate : search == undefined ? "":search.searchStartDate,
38
-                searchEndDate : search == undefined ? "":search.searchEndDate
39
-            }
40
-        }).then(function successCallback(response) {
41
-            // 请求成功执行代码
42
-            d.resolve(response.data);
43
-        }, function errorCallback(response) {
44
-            // 请求失败执行代码
45
-            d.reject("error");
46
-        });
47
-        return d.promise;
48
-    };
49
-
50
-    /*// 虫害逐仓实时检测接口
51
-    this.nowInsectPest = function (storeCode) {
52
-        var d = $q.defer();
53
-        $http({
54
-            method : 'POST',
55
-            url : APP_CONFIG.intelligentUrl + '/intelligents/insectPestDetection/sendNowInsectPest',
56
-            data : {
57
-                storeCode : storeCode
58
-            }
59
-        }).then(function successCallback(response) {
60
-            // 请求成功执行代码
61
-            d.resolve(response.data);
62
-        }, function errorCallback(response) {
63
-            // 请求失败执行代码
64
-            d.reject("error");
65
-        });
66
-        return d.promise;
67
-    };*/
68
-
69
-    // 虫害单仓检测接口
70
-    this.onlyInsectPestDetection = function (vCfCode) {
71
-        var d = $q.defer();
72
-        $http({
73
-            method : 'POST',
74
-            url : APP_CONFIG.intelligentUrl + '/intelligents/insectPestDetection/sendOnlyInsectPestDetection',
75
-            data : {
76
-                vCfCode : vCfCode,
77
-                orgId: $rootScope.depotInfo.orgId
78
-            }
79
-        }).then(function successCallback(response) {
80
-            // 请求成功执行代码
81
-            d.resolve(response.data);
82
-        }, function errorCallback(response) {
83
-            // 请求失败执行代码
84
-            d.reject("error");
85
-        });
86
-        return d.promise;
87
-    };
88
-
89
-    // 虫害全库检测接口
90
-    this.allInsectPestDetection = function () {
91
-        var d = $q.defer();
92
-        $http({
93
-            method : 'GET',
94
-            url : APP_CONFIG.intelligentUrl + '/intelligents/insectPestDetection/sendInsectPestDetectionAll',
95
-            params : {
96
-                orgId: $rootScope.depotInfo.orgId
97
-            }
98
-        }).then(function successCallback(response) {
99
-            // 请求成功执行代码
100
-            d.resolve(response.data);
101
-        }, function errorCallback(response) {
102
-            // 请求失败执行代码
103
-            d.reject("error");
104
-        });
105
-        return d.promise;
106
-    };
107
-
108
-    // 虫害单仓手工录入
109
-    this.saveInsectPestDate = function (insectPests) {
110
-        var d = $q.defer();
111
-        $http({
112
-            method : 'POST',
113
-            url : APP_CONFIG.intelligentUrl + '/intelligents/insectPestDetection/addInsectPestData',
114
-            data : {
115
-                insectPests : angular.toJson(insectPests)
116
-            }
117
-        }).then(function successCallback(response) {
118
-            // 请求成功执行代码
119
-            d.resolve(response.data);
120
-        }, function errorCallback(response) {
121
-            // 请求失败执行代码
122
-            d.reject("error");
123
-        });
124
-        return d.promise;
125
-    };
126
-
127
-});

+ 18 - 5
depot-web/src/main/resources/static/app/intelligent/grainDetection/views/insectPestDetection-edit.html

@@ -25,6 +25,19 @@
25 25
 
26 26
 								<fieldset>
27 27
 									<table class="table table-striped table-bordered table-hover" width="100%">
28
+										<tr ng-show="insectPests.hcjcdh != null">
29
+											<th width='15%'>
30
+												<label class="label" style="margin-top: 9px;text-align: center;">害虫检测单号<span style="color: red;">*</span></label>
31
+											</th>
32
+											<th width='30%' colspan="2">
33
+												<label class="input">
34
+													<input type="text" ng-model="insectPests.hcjcdh" required ng-disabled="SFUpdate || isNotSave"/>
35
+												</label>
36
+											</th>
37
+											<th></th>
38
+											<th></th>
39
+											<th></th>
40
+										</tr>
28 41
 										<tr>
29 42
 											<th width='15%'>
30 43
 												<label class="label" style="margin-top: 9px;text-align: center;">仓房名称<span style="color: red;">*</span></label>
@@ -33,7 +46,7 @@
33 46
 												<label class="select">
34 47
 													<select ng-model="houseId" name="houseId" class="form-control input-sm"
35 48
 															ng-options="store.storehouseId as store.storehouseName for store in storelist"
36
-															ng-change="loadWare(houseId)" required>
49
+															ng-change="loadWare(houseId)" required ng-disabled="SFUpdate || isNotSave">
37 50
 														<option value="">请选择</option>
38 51
 													</select> <i></i>
39 52
 												</label>
@@ -44,7 +57,7 @@
44 57
 											<th width='15%'>
45 58
 												<label class="select">
46 59
 													<select ng-model="insectPests.vHwCode" name="vHwCode" class="form-control input-sm"
47
-															ng-options="ware.warehouseId as ware.warehouseName for ware in warelist" required>
60
+															ng-options="ware.warehouseId as ware.warehouseName for ware in warelist" required ng-disabled="SFUpdate || isNotSave">
48 61
 														<option value="">请选择</option>
49 62
 													</select> <i></i>
50 63
 												</label>
@@ -66,11 +79,11 @@
66 79
 										</tr>
67 80
 										<tr>
68 81
 											<th>
69
-												<label class="label" style="margin-top: 9px;text-align: center;">扦样人</label>
82
+												<label class="label" style="margin-top: 9px;text-align: center;">扦样人<span style="color: red;">*</span></label>
70 83
 											</th>
71 84
 											<th>
72 85
 												<label class="input">
73
-													<input type="text" ng-model="insectPests.standOr"/>
86
+													<input type="text" ng-model="insectPests.standOr" required/>
74 87
 												</label>
75 88
 											</th>
76 89
 											<th>
@@ -155,7 +168,7 @@
155 168
 									</table>
156 169
 								</fieldset>
157 170
 								<footer class="text-align-center">
158
-									<button type="button" class="btn btn-primary" ng-click="saveData()">保存</button>
171
+									<button type="button" ng-show="(SFUpdate && !isNotSave) || (!SFUpdate && !isNotSave)" class="btn btn-primary" ng-click="saveData()">保存</button>
159 172
 									<button type="button" class="btn btn-default" ng-click="retList()">取消</button>
160 173
 								</footer>
161 174
 								<div id="dtBox"></div><!-- 时间控件:有时分秒 -->

+ 10 - 8
depot-web/src/main/resources/static/app/intelligent/grainDetection/views/insectPestDetection-list.html

@@ -17,7 +17,7 @@
17 17
                                     <div class="col-xs-12 col-sm-10">
18 18
                                         <a href-void class="btn btn-default btn-sm" ng-show="isShow" ng-click="retList()"><i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;</a>
19 19
                                         <label>
20
-                                            <a href-void class="btn btn-primary btn-sm" ng-click="showAdd()"><i class="fa fa-plus"></i>&nbsp;新&nbsp;增</a>
20
+                                            <a href-void class="btn btn-primary btn-sm" ng-click="showUpdate('add')"><i class="fa fa-plus"></i>&nbsp;新&nbsp;增</a>
21 21
                                         </label>&emsp;
22 22
                                         <label> 仓房名称:&emsp;
23 23
                                             <select ng-model="search.vCfCode" class="form-control input-sm"
@@ -56,12 +56,10 @@
56 56
                                         <th data-class="expand" style="text-align:center;">序号</th>
57 57
                                         <th data-class="expand" style="text-align:center;">仓房名称</th>
58 58
                                         <th data-class="expand" style="text-align:center;">货位名称</th>
59
-                                        <th data-class="expand" style="text-align:center;">扦养人</th>
60
-                                        <th data-class="expand" style="text-align:center;">扦养时间</th>
59
+                                        <th data-class="expand" style="text-align:center;">害虫检测单号</th>
61 60
                                         <th data-class="expand" style="text-align:center;">通道号</th>
62 61
                                         <th data-class="expand" style="text-align:center;">害虫种类</th>
63 62
                                         <th data-class="expand" style="text-align:center;">虫情(个)</th>
64
-                                        <th data-class="expand" style="text-align:center;">检测人</th>
65 63
                                         <th data-class="expand" style="text-align:center;">检测时间</th>
66 64
                                         <th data-class="expand" style="text-align:center;">操作</th>
67 65
                                     </tr>
@@ -72,15 +70,19 @@
72 70
                                         <td style="text-align:center;">{{ $index + 1 }}</td>
73 71
                                         <td style="text-align:center;">{{ storeHouseCodeObj[insectPest.vCfCode].storehouseName }}</td>
74 72
                                         <td style="text-align:center;">{{ wares[insectPest.vHwId].warehouseName }}</td>
75
-                                        <td style="text-align:center;">{{ insectPest.standOr }}</td>
76
-                                        <td style="text-align:center;">{{ insectPest.standTime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
73
+                                        <td style="text-align:center;">{{ insectPest.hcjcdh }}</td>
77 74
                                         <td style="text-align:center;">{{ insectPest.iTdh }}</td>
78 75
                                         <td style="text-align:center;">{{ dicData[insectPest.hczl] }}</td>
79 76
                                         <td style="text-align:center;">{{ insectPest.iValue }}</td>
80
-                                        <td style="text-align:center;">{{ insectPest.vUpdatePeople }}</td>
81 77
                                         <td style="text-align:center;">{{ insectPest.vUpdateTime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
82 78
                                         <td style="text-align:center;">
83
-                                            <a ng-hide="insectPest.iTdh == null" href-void ng-click="onlyInsectPestDetection(insectPest.vCfCode)"><i class=""></i>{{storeHouseCodeObj[insectPest.vCfCode].storehouseName}}检测</a>
79
+                                            <span ng-hide="insectPest.iTdh == null">
80
+                                                 <a href-void ng-click="onlyInsectPestDetection(insectPest.vCfCode)"><i class=""></i>{{storeHouseCodeObj[insectPest.vCfCode].storehouseName}}检测</a>
81
+                                            </span>
82
+                                            <span ng-hide="insectPest.standOr == null">
83
+                                                 <a href-void ng-click="showUpdate('edit',insectPest.dataId,insectPest.valueId)"><i class=""></i>修改</a>
84
+                                                 <a href-void ng-click="showUpdate('detail',insectPest.dataId,insectPest.valueId)"><i class=""></i>查看</a>
85
+                                            </span>
84 86
                                         </td>
85 87
                                     </tr>
86 88
                                     </tbody>

+ 1 - 1
depot-web/src/main/resources/static/app/intelligent/module.js

@@ -266,7 +266,7 @@ angular.module('app.intelligent',['ui.router']).config(function($stateProvider)
266 266
         )
267 267
         // 虫害手工录入
268 268
         .state('app.intelligent.grainDetection.insectPestDetectionEdit', {
269
-                url: '/intelligent/grainDetection/insectPestDetectionEdit',
269
+                url: '/intelligent/grainDetection/insectPestDetectionEdit/:insetType/:dataId/:valueId',
270 270
                 data: {
271 271
                     title: '虫害检测数据'
272 272
                 },