虫害优化

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

@@ -257,14 +257,14 @@ public class InsectPestDetectionController {
             tCcdata.setOrgId(orgId);//组织机构id
             tCcdata.setvHwCode(jsStr.get("vHwCode").toString());//货位code
             tCcdata.setvCcCode(jsStr.get("vCfCode").toString());//仓房code
-            tCcdata.setStandOr(jsStr.get("standOr").toString());//扦养人
+            tCcdata.setStandOr(jsStr.get("standOr")==null ? "":jsStr.get("standOr").toString());//扦养人
             tCcdata.setStandTime(ParameterUtil.string2datetime(jsStr.get("standTime").toString()));//扦养时间
             tCcdata.setHczl(jsStr.get("hczl").toString());//害虫种类
             tCcdata.setiValue(Integer.parseInt(jsStr.get("iValue").toString()));//数量
             tCcdata.setvUpdateTime(ParameterUtil.string2datetime(jsStr.get("vUpdateTime").toString()));//监测时间
-            tCcdata.setJchcff(jsStr.get("jchcff").toString());//检查害虫方法
-            tCcdata.setCldjpd(jsStr.get("cldjpd").toString());//虫粮等级判定
-            tCcdata.setHckyxfx(jsStr.get("hckyxfx").toString());//害虫抗药性分析
+            tCcdata.setJchcff(jsStr.get("jchcff")==null ? "":jsStr.get("jchcff").toString());//检查害虫方法
+            tCcdata.setCldjpd(jsStr.get("cldjpd")==null ? "":jsStr.get("cldjpd").toString());//虫粮等级判定
+            tCcdata.setHckyxfx(jsStr.get("hckyxfx")==null ? "":jsStr.get("hckyxfx").toString());//害虫抗药性分析
             tCcdata.setvUpdatePeople(jsStr.get("vUpdatePeople").toString());//检测人
             tCcdata.setId(uuidUtils.getCode());//唯一id
             tCcdata.setDataSource("1");//数据来源0是自动检测，1是手工录入

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

@@ -74,12 +74,12 @@
 												</label>
 											</th>
 											<th>
-												<label class="label" style="margin-top: 9px;text-align: center;">扦样时间</label>
+												<label class="label" style="margin-top: 9px;text-align: center;">扦样时间<span style="color: red;">*</span></label>
 											</th>
 											<th>
 												<label class="input">
 													<input type="text" ng-model="insectPests.standTime" name="standTime"
-														   class="form-control datepicker" onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})">
+														   class="form-control datepicker" onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required>
 												</label>
 											</th>
 											<th >
@@ -133,12 +133,12 @@
 										</tr>
 										<tr>
 											<th>
-												<label class="label" style="margin-top: 9px;text-align: center;">检测时间</label>
+												<label class="label" style="margin-top: 9px;text-align: center;">检测时间<span style="color: red;">*</span></label>
 											</th>
 											<th>
 												<label class="input">
 													<input type="text" ng-model="insectPests.vUpdateTime" name="vUpdateTime"
-														   class="form-control datepicker" onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})"/>
+														   class="form-control datepicker" onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required/>
 												</label>
 											</th>
 											<th>