fix

src/main/java/com/chinaitop/depot/fumigation/controller/FumigationAlterController.java

@@ -15,6 +15,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -194,7 +195,9 @@ public class FumigationAlterController {
             criteria.andRecordIdEqualTo(tFumigationAfter.getRecordId());
             criteria.andDeleteStateEqualTo("1");
             List<TFumigationProcess> tFumigationProcess = fumigationProcessService.getDataByFumId(example);
-            modelMap.put("processEdit",tFumigationProcess.get(0));//熏蒸作业过程数据
+            if(!CollectionUtils.isEmpty(tFumigationProcess)){
+                modelMap.put("processEdit",tFumigationProcess.get(0));//熏蒸作业过程数据
+            }
 
             TFumigationForrecord fumigationForrecord = fumigationForRecordService.getById(tFumigationAfter.getRecordId());
             /* TFumigationPlan tFumigationPlan = fumigationPlanService.findById(tFumigationProcess.getFumigationId());*/

src/main/java/com/chinaitop/depot/fumigation/controller/FumigationForRecordController.java

@@ -576,16 +576,34 @@ public class FumigationForRecordController {
             BigDecimal zyyl = new BigDecimal(ObjectUtils.toString(detail.get("totalDosage")));
             String hcjcdh = (String)detail.get("pestNo");
             List<Map<String,Object>> pest =  (List<Map<String,Object>>)detail.get("pestVOS");
+
             if(!CollectionUtils.isEmpty(pest)){
                 String zyhc = "";
                 String ckmd = "";
                 for (Map<String, Object> stringObjectMap : pest) {
+                    TFumigationPesticide pesticide = new TFumigationPesticide();
+                    pesticide.setRecordId(uuid);
                     if(stringObjectMap.get("pestType") !=null){
                         zyhc +=(String)stringObjectMap.get("pestType")+"#";
+                        pesticide.setMajorInsectPests(Integer.valueOf((String)stringObjectMap.get("pestType")));
                     }
                     if(stringObjectMap.get("density") !=null){
                         ckmd += (String)stringObjectMap.get("density") + "|";
+                        pesticide.setInsectDensity((String)stringObjectMap.get("density"));
+                    }
+                    if(yjmc!=null){
+                        pesticide.setDrugName(Integer.valueOf(yjmc));
+                    }
+                    if(stringObjectMap.get("discoveryTime")!=null){
+                        pesticide.setInsectProductTime(format.parse((String)stringObjectMap.get("discoveryTime")));
+                    }
+                    if(stringObjectMap.get("happenPosition")!=null){
+                        pesticide.setOccurrencePlace((String)stringObjectMap.get("happenPosition"));
+                    }
+                    if(stringObjectMap.get("pestResistance")!=null){
+                        pesticide.setDrugResistance((String)stringObjectMap.get("pestResistance"));
                     }
+                    pesticidePlanService.add(pesticide);
                 }
                 zyhc = zyhc.substring(0,zyhc.lastIndexOf("#"));
                 ckmd = ckmd.substring(0,ckmd.lastIndexOf("|"));

src/main/java/com/chinaitop/depot/fumigation/controller/FumigationProcessController.java

@@ -103,12 +103,13 @@ public class FumigationProcessController {
     @RequestMapping(value="/saveFumigationProcessDate", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
     @ApiOperation(value="保存熏蒸作业信息", notes = "保存熏蒸作业信息")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "fumigation", value = "熏蒸作业数据", paramType = "form")
+            @ApiImplicitParam(name = "fumigationProcess", value = "熏蒸作业数据", paramType = "form")
     })
     public Map<String, Object> saveFumigationProcessDate(String fumigationProcess) throws Exception {
         Map<String, Object> modelMap = new HashMap<String, Object>();
         // JSON字符串转对象
         ObjectMapper mapper = new ObjectMapper();
+        //TFumigationProcess tFumigationProcess = mapper.readValue(fumigationProcess,TFumigationProcess.class);
         TFumigationProcess tFumigationProcess = (TFumigationProcess) JsonToObjectUtils.jsonToObject(fumigationProcess,"com.chinaitop.depot.fumigation.model.TFumigationProcess");
         tFumigationProcess.setDeleteState("1");//默认设置删除标志
         if (tFumigationProcess.getId() == null) {

src/main/java/com/chinaitop/depot/fumigation/controller/PesticidePlanController.java

@@ -226,6 +226,26 @@ public class PesticidePlanController {
     }
 
     /**
+     * 根据熏蒸id查询施药数据
+     * @param id 主键id
+     * @return
+     */
+    @RequestMapping(value="/getByRecordId", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="根据熏蒸备案id查询施药数据", notes = "根据熏蒸备案id查询施药数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "recordId", value = "熏蒸备案id", paramType = "query")
+    })
+    public List<TFumigationPesticide> getByRecordId(String recordId) {
+        TFumigationPesticideExample example = new TFumigationPesticideExample();
+        TFumigationPesticideExample.Criteria criteria = example.createCriteria();
+        criteria.andRecordIdEqualTo(recordId);
+
+        List<TFumigationPesticide> tFumigationPesticides = pesticidePlanService.getFumigationPesticideList(example);
+
+        return tFumigationPesticides;
+    }
+
+    /**
      * 施药方案状态提交
      *
      * @param id 数据ID

src/main/java/com/chinaitop/depot/fumigation/mapper/TFumigationPesticideMapper.xml

@@ -44,6 +44,7 @@
     <result column="kjdwyyl" property="kjdwyyl" jdbcType="DECIMAL" />
     <result column="syff" property="syff" jdbcType="VARCHAR" />
     <result column="fzsycs" property="fzsycs" jdbcType="VARCHAR" />
+    <result column="record_id" property="recordId" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -110,7 +111,7 @@
     seal_type, setting_concentration, concentration_check_type, bulk_gas_type, drug_user_number, 
     pesticide_operator, creater, create_time, update_time, state, approve_people, approve_department, 
     approve_note, approve_time, org_id, delete_state, updatetime, syryzzqk, syzzsh, jx, 
-    lddwyyl, kjdwyyl, syff, fzsycs
+    lddwyyl, kjdwyyl, syff, fzsycs,record_id
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.fumigation.model.TFumigationPesticideExample" >
     select
@@ -157,7 +158,7 @@
       org_id, delete_state, updatetime, 
       syryzzqk, syzzsh, jx, 
       lddwyyl, kjdwyyl, syff, 
-      fzsycs)
+      fzsycs,record_id)
     values (#{id,jdbcType=VARCHAR}, #{fumigationId,jdbcType=VARCHAR}, #{majorInsectPests,jdbcType=INTEGER}, 
       #{insectDensity,jdbcType=VARCHAR}, #{occurrencePlace,jdbcType=VARCHAR}, #{insectProductTime,jdbcType=TIMESTAMP}, 
       #{drugResistance,jdbcType=VARCHAR}, #{drugName,jdbcType=INTEGER}, #{reagentType,jdbcType=VARCHAR}, 
@@ -172,7 +173,7 @@
       #{orgId,jdbcType=VARCHAR}, #{deleteState,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP}, 
       #{syryzzqk,jdbcType=VARCHAR}, #{syzzsh,jdbcType=VARCHAR}, #{jx,jdbcType=VARCHAR}, 
       #{lddwyyl,jdbcType=DECIMAL}, #{kjdwyyl,jdbcType=DECIMAL}, #{syff,jdbcType=VARCHAR}, 
-      #{fzsycs,jdbcType=VARCHAR})
+      #{fzsycs,jdbcType=VARCHAR},#{recordId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.fumigation.model.TFumigationPesticide" >
     insert into t_fumigation_pesticide

src/main/java/com/chinaitop/depot/fumigation/model/TFumigationForrecord.java

@@ -1,5 +1,6 @@
 package com.chinaitop.depot.fumigation.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
@@ -15,9 +16,12 @@ public class TFumigationForrecord {
 
     private String contactPhone;
 
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date fumigationStart;
 
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date fumigationEnd;
 
     private String east;
@@ -36,16 +40,22 @@ public class TFumigationForrecord {
 
     private Integer creater;
 
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
 
     private String outPerson;
 
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date outForrecordTime;
 
     private Integer orgId;
 
     private String deleteState;
 
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updatetime;
 
     private List<TFumigationPersonnel> fumigationPersonnelList;
@@ -205,6 +215,8 @@ public class TFumigationForrecord {
     /**
      *药剂有效期
      */
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date yjyxq;
 
     /**
@@ -225,6 +237,8 @@ public class TFumigationForrecord {
     /**
      * 领取时间
      */
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date lqsj;
 
     /**
@@ -235,6 +249,8 @@ public class TFumigationForrecord {
     /**
      * 审批时间
      */
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date spsj;
 
     /**
@@ -280,6 +296,8 @@ public class TFumigationForrecord {
     /**
      * 申请日期
      */
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date sqrq;
 
     /**

src/main/java/com/chinaitop/depot/fumigation/model/TFumigationPesticide.java

@@ -1,5 +1,8 @@
 package com.chinaitop.depot.fumigation.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -14,6 +17,8 @@ public class TFumigationPesticide {
 
     private String occurrencePlace;
 
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date insectProductTime;
 
     private String drugResistance;
@@ -28,14 +33,20 @@ public class TFumigationPesticide {
 
     private String getPerson;
 
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date getTime;
 
     private String drugPurity;
 
     private String useDrugType;
 
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date plannDrugStartTime;
 
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date plannDrugUseUpTime;
 
     private String plannDrugCount;
@@ -54,8 +65,12 @@ public class TFumigationPesticide {
 
     private Integer creater;
 
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
 
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
     private Integer state;
@@ -66,12 +81,16 @@ public class TFumigationPesticide {
 
     private String approveNote;
 
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date approveTime;
 
     private String orgId;
 
     private String deleteState;
 
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updatetime;
 
     private String syryzzqk;
@@ -89,6 +108,11 @@ public class TFumigationPesticide {
     private String fzsycs;
 
     /**
+     * 备案id
+     */
+    private String recordId;
+
+    /**
      * 施药任务表
      * @return id 施药任务表
      */
@@ -759,4 +783,12 @@ public class TFumigationPesticide {
     public void setFzsycs(String fzsycs) {
         this.fzsycs = fzsycs == null ? null : fzsycs.trim();
     }
+
+    public String getRecordId() {
+        return recordId;
+    }
+
+    public void setRecordId(String recordId) {
+        this.recordId = recordId;
+    }
 }

src/main/java/com/chinaitop/depot/fumigation/model/TFumigationPesticideExample.java

@@ -2907,6 +2907,11 @@ public class TFumigationPesticideExample {
             addCriterion("fzsycs not between", value1, value2, "fzsycs");
             return (Criteria) this;
         }
+
+        public Criteria andRecordIdEqualTo(String value) {
+            addCriterion("record_id =", value, "recordId");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/java/com/chinaitop/depot/fumigation/model/TFumigationProcess.java

@@ -1,5 +1,8 @@
 package com.chinaitop.depot.fumigation.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -32,6 +35,8 @@ public class TFumigationProcess {
 
     private String oxygenAlarmDevice;
 
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date firstUseDrugTime;
 
     private String firstUseDrugUnit;
@@ -40,10 +45,14 @@ public class TFumigationProcess {
 
     private String circulationUseTime;
 
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date firstSupplementDrugTime;
 
     private String firstSupplementDrugCount;
 
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date lastSupplementDrugTime;
 
     private String lastSupplementDrugCount;
@@ -100,10 +109,16 @@ public class TFumigationProcess {
 
     private Integer isHaveFirstAidKit;
 
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date bulkStartTime;
 
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date bulkEndTime;
 
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date perforatedDate;
 
     private String perforatedDays;
@@ -126,12 +141,18 @@ public class TFumigationProcess {
 
     private Integer taskState;
 
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date taskEndTime;
 
     private Integer creater;
 
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
 
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
     private Integer orgId;
@@ -140,6 +161,8 @@ public class TFumigationProcess {
 
     private String dataSource;
 
+    @DateTimeFormat(pattern="yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updatetime;
 
     private String yqbjyaqjc;