同步代码

src/main/java/com/unissoft/grainManage/controller/GrainConditionRecordController.java

@@ -1,20 +1,17 @@
 package com.unissoft.grainManage.controller;
 
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.unissoft.grainManage.service.GrainConditionRecordService;
 import com.unissoft.model.GrainConditionRecord;
 import com.unissoft.result.PageParam;
 import com.unissoft.result.ResultView;
-import com.unissoft.grainManage.service.GrainConditionRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 /**
  * <p>
@@ -31,8 +28,8 @@ public class GrainConditionRecordController {
     @Autowired
     private GrainConditionRecordService grainConditionRecordService;
 
-    @Autowired
-    private RedisTemplate  redisTemplate;
+   /* @Autowired
+    private RedisTemplate  redisTemplate;*/
 
 
     @ApiOperation(value = "根据角色id查询角色下有那些资源", notes = "")
@@ -43,40 +40,34 @@ public class GrainConditionRecordController {
     }
 
 
-    @ApiOperation(value = "分页条件查询", notes = "提交参数：{\"pageIndex\":1,\"pageSize\":10,\",\"condition\":\"{'check_person':'','check_time':''\"}")
+    @ApiOperation(value = "分页条件查询", notes = "提交参数：{\"pageIndex\":1,\"pageSize\":10,\",\"condition\":\"{'check_person':'','check_start_time':'','check_end_time':''\"}")
     @PostMapping("/authority/getPage")
     public ResultView getPage(@RequestBody PageParam pageParam) {
         Page<GrainConditionRecord> page = grainConditionRecordService.getPage(pageParam);
         return ResultView.success(page);
     }
 
+    //@BussinessLog(operation = "粮情检测记录根据id查询" , operationType = "查询")
     @ApiOperation(value = "根据id查询", notes = "")
     @GetMapping("/authority/getById/{id}")
     public ResultView getById(@PathVariable Long id) {
-        GrainConditionRecord model = null;
-        if(redisTemplate.hasKey(String.valueOf(StrUtil.format("{}{}", "grainConditionRecord_",id)))){
-            String redisKey = String.valueOf(StrUtil.format("{}{}",
-                    "grainConditionRecord_",id));
-            return ResultView.success(redisTemplate.opsForValue().get(redisKey));
-        }else {
-            model = grainConditionRecordService.getById(id);
-            String redisKey = String.valueOf(StrUtil.format("{}{}",
-                    "grainConditionRecord_",id));
-            redisTemplate.opsForValue().set(redisKey, model, 7, TimeUnit.DAYS);
-        }
+        GrainConditionRecord model = grainConditionRecordService.getRecordById(id);
         return ResultView.success(model);
     }
 
     @ApiOperation(value = "新增", notes = "")
     @PostMapping("/authority_button/add")
     public ResultView add(@RequestBody GrainConditionRecord model) {
+        System.out.println("粮情新增参数"+model.toString());
         grainConditionRecordService.saveGrainRecord(model);
         return ResultView.success(model);
     }
 
+   // @BussinessLog(operation = "粮情检测记录修改" , operationType = "修改")
     @ApiOperation(value = "修改", notes = "")
     @PostMapping("/authority_button/update")
     public ResultView update(@RequestBody GrainConditionRecord model) {
+        System.out.println("粮情修改参数"+model.toString());
         grainConditionRecordService.updateGrainRecord(model);
         return ResultView.success(model);
     }
@@ -84,14 +75,15 @@ public class GrainConditionRecordController {
     @ApiOperation(value = "根据id删除", notes = "")
     @DeleteMapping("/authority_button/deleteById/{id}")
     public ResultView deleteById(@PathVariable Integer id) {
+        System.out.println("粮情删除参数id"+id.toString());
         grainConditionRecordService.deleteById(id);
         return ResultView.success();
     }
 
-    @ApiOperation(value = "根据角色和时间查询", notes = "最新粮情检查记录")
-    @GetMapping("/authority/getByRoleTime")
-    public  ResultView getByRoleTime() {
-        List<GrainConditionRecord> list =  grainConditionRecordService.getByRoleTime();
+    @ApiOperation(value = "根据角色和时间查询", notes = "提交参数：{\"pageIndex\":1,\"pageSize\":10}")
+    @PostMapping("/authority/getByRoleTime")
+    public ResultView getByRoleTime(@RequestBody PageParam pageParam) {
+        List<GrainConditionRecord> list = grainConditionRecordService.getByRoleTime(pageParam);
         return ResultView.success(list);
     }
 

src/main/java/com/unissoft/grainManage/controller/GrainManageDictionaryController.java

@@ -1,21 +1,17 @@
 package com.unissoft.grainManage.controller;
 
 
-import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.unissoft.model.GrainConditionRecord;
+import com.unissoft.grainManage.service.GrainManageDictionaryService;
 import com.unissoft.model.GrainManageDictionary;
 import com.unissoft.result.PageParam;
 import com.unissoft.result.ResultView;
-import com.unissoft.grainManage.service.GrainManageDictionaryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * <p>
  *  前端控制器
@@ -32,9 +28,9 @@ public class GrainManageDictionaryController {
     @Autowired
     private GrainManageDictionaryService grainManageDictionaryService;
 
-    @Autowired
+   /* @Autowired
     private RedisTemplate redisTemplate;
-
+*/
 
     @ApiOperation(value = "分页条件查询", notes = "提交参数：{\"pageIndex\":1,\"pageSize\":10,\",\"condition\":\"{'table_name':'grain_condition_record','field_name':'check_list'\"}")
     @PostMapping("/authority/getPage")

src/main/java/com/unissoft/grainManage/service/GrainConditionRecordService.java

@@ -26,7 +26,9 @@ public interface GrainConditionRecordService extends IService<GrainConditionReco
 
     void deleteById(Integer id);
 
-    List<GrainConditionRecord>  getByRoleTime();
+    List<GrainConditionRecord>  getByRoleTime(PageParam pageParam);
 
-   // List<GrainConditionRecord>  getByPersonAndTime();
+    GrainConditionRecord getRecordById(Long id);
+
+    // List<GrainConditionRecord>  getByPersonAndTime();
 }

src/main/java/com/unissoft/grainManage/service/impl/GrainConditionRecordServiceImpl.java

@@ -5,17 +5,18 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.unissoft.MyConstant;
 import com.unissoft.mapper.GrainAbnormalDescribeMapper;
 import com.unissoft.mapper.GrainCheckChooseRecordMapper;
 import com.unissoft.mapper.GrainConditionRecordMapper;
 import com.unissoft.mapper.SysResourceRoleMapper;
-import com.unissoft.model.GrainAbnormalDescribe;
-import com.unissoft.model.GrainCheckChooseRecord;
-import com.unissoft.model.GrainConditionRecord;
-import com.unissoft.model.SysResourceRole;
+import com.unissoft.model.*;
 import com.unissoft.result.PageParam;
 import com.unissoft.grainManage.service.GrainConditionRecordService;
+import com.unissoft.result.ResultView;
+import com.unissoft.utils.DateUtil;
 import org.apache.commons.lang.ObjectUtils;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,9 +26,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -51,11 +50,11 @@ public class GrainConditionRecordServiceImpl extends ServiceImpl<GrainConditionR
     @Autowired
     private GrainAbnormalDescribeMapper grainAbnormalDescribeMapper;
 
-    @Autowired
+   /* @Autowired
     private RedisTemplate redisTemplate;
 
     @Autowired
-    private StringRedisTemplate stringRedisTemplate;
+    private StringRedisTemplate stringRedisTemplate;*/
 
     @Autowired
     private GrainCheckChooseRecordMapper grainCheckChooseRecordMapper;
@@ -80,11 +79,11 @@ public class GrainConditionRecordServiceImpl extends ServiceImpl<GrainConditionR
         QueryWrapper<GrainConditionRecord> ew = new QueryWrapper<>();
         if (!StringUtils.isEmpty(pageParam.getCondition())) {
             JSONObject object = new JSONObject(pageParam.getCondition());
-            String checkPerson = object.getString("check_person").trim();
-            String startTime = object.getString("check_time").trim();
-            String endTime = object.getString("check_time").trim();
+            String checkPerson = object.optString("check_person").trim();
+            String startTime = object.optString("check_start_time").trim();
+            String endTime = object.optString("check_end_time").trim();
             if (!StringUtils.isEmpty(checkPerson)) {
-                ew.like("check_person", checkPerson);
+                ew.eq("check_person", checkPerson);
             }
             if (!StringUtils.isEmpty(startTime)) {
                 ew.ge("check_time", startTime);
@@ -100,6 +99,11 @@ public class GrainConditionRecordServiceImpl extends ServiceImpl<GrainConditionR
             page = new Page(pageIndex, pageSize);
         }
         Page<GrainConditionRecord> pageResult = grainConditionRecordMapper.selectPage(page, ew);
+        List<GrainConditionRecord> records = pageResult.getRecords();
+        for(GrainConditionRecord grainConditionRecord : records){
+            GrainAbnormalDescribe grainAbnormalDescribe = grainAbnormalDescribeMapper.getSelectId(grainConditionRecord.getId());
+            grainConditionRecord.setGrainAbnormalDescribe(grainAbnormalDescribe);
+        }
         return pageResult;
     }
 
@@ -107,44 +111,50 @@ public class GrainConditionRecordServiceImpl extends ServiceImpl<GrainConditionR
     @Override
     public void saveGrainRecord(GrainConditionRecord model) {
         //新增粮情检查
+        String  checkChooseRecord = model.getCheckDescribe();
+        System.out.println("检查项，选项"+checkChooseRecord);
+
         grainConditionRecordMapper.insert(model);
+        if(org.apache.commons.lang.StringUtils.isNotBlank(checkChooseRecord)) {
 
-        GrainAbnormalDescribe grainAbnormalDescribe = model.getGrainAbnormalDescribe();
-        int id = grainConditionRecordMapper.getSelectId();
-        grainAbnormalDescribe.setGrainRecordId(id);
-
-        //新增粮情检查描述
-        grainAbnormalDescribeMapper.insert(grainAbnormalDescribe);
-        String json = JSON.toJSONString(model);
-
-        String checkDescribe = model.getCheckDescribe();
-        Map mapTypes = JSON.parseObject(checkDescribe);
-        for (Object key : mapTypes.keySet()) {
-            System.out.println("key为：" + key + "值为：" + mapTypes.get(key));
-            GrainCheckChooseRecord grainCheckChooseRecord = new GrainCheckChooseRecord();
-            grainCheckChooseRecord.setCheckList(ObjectUtils.toString(key));
-            grainCheckChooseRecord.setChoose(ObjectUtils.toString(mapTypes.get(key)));
-            grainCheckChooseRecord.setGrainRecordId(id);
-            grainCheckChooseRecord.setCreateTime(new Date());
-            grainCheckChooseRecordMapper.insert(grainCheckChooseRecord);
+            Integer id = grainConditionRecordMapper.getSelectRecordId();
+            System.out.println("grainConditionRecordId =========" +id);
+            //保存检查项和选项
+            Map mapTypes = JSON.parseObject(checkChooseRecord);
+            for (Object key : mapTypes.keySet()) {
+                System.out.println("key为：" + key + "值为：" + mapTypes.get(key));
+                GrainCheckChooseRecord grainCheckChooseRecord = new GrainCheckChooseRecord();
+                grainCheckChooseRecord.setCheckList(ObjectUtils.toString(key));
+                grainCheckChooseRecord.setGrainRecordId(id);
+                Map map = JSON.parseObject(JSON.toJSONString(mapTypes.get(key)), Map.class);
+                if(map != null && !map.isEmpty()) {
+                    grainCheckChooseRecord.setChoose(ObjectUtils.toString(map.get("choose")));
+                    grainCheckChooseRecord.setCreateTime(ObjectUtils.toString(map.get("time")));
+                }
+                grainCheckChooseRecordMapper.insert(grainCheckChooseRecord);
+            }
+            if(model.getGrainAbnormalDescribe() != null) {
+                GrainAbnormalDescribe grainAbnormalDescribe = model.getGrainAbnormalDescribe();
+                grainAbnormalDescribe.setGrainRecordId(id);
+                //新增粮情检查描述
+                grainAbnormalDescribeMapper.insert(grainAbnormalDescribe);
+            }
         }
-
-        String redisKey = String.valueOf(StrUtil.format("{}{}",
-                "grainConditionRecord_", id));
-        redisTemplate.opsForValue().set(redisKey, json, 7, TimeUnit.DAYS);
     }
 
     @Transactional
     @Override
     public void updateGrainRecord(GrainConditionRecord model) {
 
+        String  checkChooseRecord = model.getCheckDescribe();
+        model.setCheckDescribe(checkChooseRecord);
         grainConditionRecordMapper.updateById(model);
         QueryWrapper<GrainAbnormalDescribe> qw = new QueryWrapper<>();
         qw.eq("grain_record_id", model.getId());
         GrainAbnormalDescribe grainAbnormalDescribe = grainAbnormalDescribeMapper.selectOne(qw);
-
+        //保存异常描述
         if(grainAbnormalDescribe != null){
-            grainAbnormalDescribe.setGrainRecordId(model.getGrainAbnormalDescribe().getGrainRecordId());
+            grainAbnormalDescribe.setGrainRecordId(model.getId());
             grainAbnormalDescribe.setAbnormalGrain(model.getGrainAbnormalDescribe().getAbnormalGrain());
             grainAbnormalDescribe.setAbnormalWater(model.getGrainAbnormalDescribe().getAbnormalWater());
             grainAbnormalDescribe.setOccurArea(model.getGrainAbnormalDescribe().getOccurArea());
@@ -153,16 +163,19 @@ public class GrainConditionRecordServiceImpl extends ServiceImpl<GrainConditionR
             grainAbnormalDescribe.setPestType(model.getGrainAbnormalDescribe().getPestType());
             grainAbnormalDescribeMapper.updateById(grainAbnormalDescribe);
         }
-        if(org.apache.commons.lang.StringUtils.isNotBlank(model.getCheckDescribe())){
-            String checkDescribe = model.getCheckDescribe();
-            Map mapTypes = JSON.parseObject(checkDescribe);
+        //保存检查项和选项
+        if(org.apache.commons.lang.StringUtils.isNotBlank(checkChooseRecord)){
+            Map mapTypes = JSON.parseObject(checkChooseRecord);
             for (Object key : mapTypes.keySet()) {
                 System.out.println("key为：" + key + "值为：" + mapTypes.get(key));
                 GrainCheckChooseRecord grainCheckChooseRecord = new GrainCheckChooseRecord();
                 grainCheckChooseRecord.setCheckList(ObjectUtils.toString(key));
-                grainCheckChooseRecord.setChoose(ObjectUtils.toString(mapTypes.get(key)));
                 grainCheckChooseRecord.setGrainRecordId(model.getId());
-                grainCheckChooseRecord.setCreateTime(new Date());
+                Map map = JSON.parseObject(JSON.toJSONString(mapTypes.get(key)), Map.class);
+                if(map != null && !map.isEmpty()) {
+                    grainCheckChooseRecord.setChoose(ObjectUtils.toString(map.get("choose")));
+                    grainCheckChooseRecord.setCreateTime(ObjectUtils.toString(map.get("time")));
+                }
                 grainCheckChooseRecordMapper.updateById(grainCheckChooseRecord);
             }
         }
@@ -172,41 +185,54 @@ public class GrainConditionRecordServiceImpl extends ServiceImpl<GrainConditionR
     @Override
     public void deleteById(Integer id) {
 
-        GrainCheckChooseRecord grainCheckChooseRecord = new GrainCheckChooseRecord();
-        grainCheckChooseRecord.setGrainRecordId(id);
-        grainAbnormalDescribeMapper.deleteById(grainCheckChooseRecord);
+        grainCheckChooseRecordMapper.getDeleteById(id);
 
-        GrainAbnormalDescribe grainAbnormalDescribe = new GrainAbnormalDescribe();
-        grainAbnormalDescribe.setGrainRecordId(id);
-        grainAbnormalDescribeMapper.deleteById(grainAbnormalDescribe);
+        grainAbnormalDescribeMapper.getDeleteById(id);
 
         GrainConditionRecord grainConditionRecord = new GrainConditionRecord();
         grainConditionRecord.setId(id);
         grainConditionRecordMapper.deleteById(grainConditionRecord);
         //删除redis中值
-        if (redisTemplate.hasKey(String.valueOf(StrUtil.format("{}{}", "grainConditionRecord_", id)))) {
-            String redisKey = String.valueOf(StrUtil.format("{}{}",
-                    "grainConditionRecord_", id));
-            redisTemplate.delete(redisKey);
-        }
     }
 
     @Override
-    public List<GrainConditionRecord> getByRoleTime() {
+    public List<GrainConditionRecord> getByRoleTime(PageParam pageParam) {
+
         List<GrainConditionRecord> list = grainConditionRecordMapper.getByCheckPersonAndCheckTime();
         for (GrainConditionRecord conditionRecord : list) {
             String checkDescribe = conditionRecord.getCheckDescribe();
-            Map mapTypes = JSON.parseObject(checkDescribe);
-            for (Object key : mapTypes.keySet()) {
-                System.out.println("key为：" + key + "值为：" + mapTypes.get(key));
-                if("pest_abnormal".equals(key) || "grain_abnormal".equals(key)  ||"water_abnormal".equals(key) ){
-                    conditionRecord.setWaterAbnormal(ObjectUtils.toString(mapTypes.get(key)));
-                    conditionRecord.setGrainAbnormal(ObjectUtils.toString(mapTypes.get(key)));
-                    conditionRecord.setPestAbnormal(ObjectUtils.toString(mapTypes.get(key)));
+            if(org.apache.commons.lang.StringUtils.isNotBlank(checkDescribe)){
+                Map mapTypes = JSON.parseObject(checkDescribe);
+                for (Object key : mapTypes.keySet()) {
+                    System.out.println("key为：" + key + "值为：" + mapTypes.get(key));
+                    if("pest_abnormal".equals(key) || "grain_abnormal".equals(key)  ||"water_abnormal".equals(key) ){
+                        Map map = JSON.parseObject(JSON.toJSONString(mapTypes.get(key)), Map.class);
+                        if(map != null && !map.isEmpty()) {
+                            conditionRecord.setWaterAbnormal(ObjectUtils.toString(map.get("choose")));
+                            conditionRecord.setGrainAbnormal(ObjectUtils.toString(map.get("choose")));
+                            conditionRecord.setPestAbnormal(ObjectUtils.toString(map.get("choose")));
+                        }
+                    }
                 }
             }
         }
-        return list;
+        List<GrainConditionRecord> listPage = new ArrayList<GrainConditionRecord>();
+        int currIdx = (pageParam.getPageIndex() > 1 ? (pageParam.getPageIndex() -1) * pageParam.getPageSize() : 0);
+        for (int i = 0; i < pageParam.getPageSize() && i < list.size() - currIdx; i++) {
+            GrainConditionRecord page = list.get(currIdx + i);
+            listPage.add(page);
+        }
+        return listPage;
+    }
+
+    @Override
+    public GrainConditionRecord getRecordById(Long id) {
+        GrainConditionRecord grainConditionRecord =  grainConditionRecordMapper.selectById(id);
+        QueryWrapper<GrainAbnormalDescribe> ew = new QueryWrapper<>();
+        ew.eq("grain_record_id",id);
+        GrainAbnormalDescribe grainAbnormalDescribe = grainAbnormalDescribeMapper.selectOne(ew);
+        grainConditionRecord.setGrainAbnormalDescribe(grainAbnormalDescribe);
+        return grainConditionRecord;
     }
 
 

src/main/java/com/unissoft/grainManage/service/impl/GrainManageDictionaryServiceImpl.java

@@ -3,8 +3,11 @@ package com.unissoft.grainManage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.unissoft.MyConstant;
+import com.unissoft.model.GrainAbnormalDescribe;
+import com.unissoft.model.GrainConditionRecord;
 import com.unissoft.model.GrainManageDictionary;
 import com.unissoft.mapper.GrainManageDictionaryMapper;
+import com.unissoft.model.whether;
 import com.unissoft.result.PageParam;
 import com.unissoft.grainManage.service.GrainManageDictionaryService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -13,6 +16,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -40,7 +45,7 @@ public class GrainManageDictionaryServiceImpl extends ServiceImpl<GrainManageDic
                 ew.eq("table_name", tableName);
             }
             if (!StringUtils.isEmpty(fieldName)) {
-                ew.eq("check_time", fieldName);
+                ew.eq("field_name", fieldName);
             }
 
         }
@@ -49,6 +54,22 @@ public class GrainManageDictionaryServiceImpl extends ServiceImpl<GrainManageDic
             page = new Page(pageIndex, pageSize);
         }
         Page<GrainManageDictionary> pageResult = grainManageDictionaryMapper.selectPage(page, ew);
+        List<GrainManageDictionary> records = pageResult.getRecords();
+        for(GrainManageDictionary grainManageDictionary : records){
+            StringBuffer sbf = new StringBuffer();
+            whether whether = new whether();
+            whether.setRadio("");
+            whether.setStatus1(grainManageDictionary.getStatus1());
+            whether.setStatus2(grainManageDictionary.getStatus2());
+            grainManageDictionary.setWhether(whether);
+
+            sbf.append(grainManageDictionary.getStatus1()).append(",");
+            sbf.append(grainManageDictionary.getStatus2());
+            if(org.apache.commons.lang.StringUtils.isNotBlank(grainManageDictionary.getStatus3())){
+                sbf.append(",").append(grainManageDictionary.getStatus3());
+            }
+            grainManageDictionary.setOptions(sbf.toString());
+        }
         return pageResult;
     }
 

src/main/java/com/unissoft/mapper/GrainAbnormalDescribeMapper.java

@@ -1,7 +1,9 @@
 package com.unissoft.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.unissoft.model.GrainAbnormalDescribe;
+import com.unissoft.model.GrainConditionRecord;
 
 /**
  * <p>
@@ -13,4 +15,8 @@ import com.unissoft.model.GrainAbnormalDescribe;
  */
 public interface GrainAbnormalDescribeMapper extends BaseMapper<GrainAbnormalDescribe> {
 
+    void getDeleteById(Integer grainAbnormalDescribe);
+
+    GrainAbnormalDescribe getSelectId(Integer id);
+
 }

src/main/java/com/unissoft/mapper/GrainAbnormalDescribeMapper.xml

@@ -18,4 +18,25 @@
         grain_record_id, pest_density, occur_position, occur_area, pest_type, abnormal_pest, abnormal_grain
     </sql>
 
+    <delete id="getDeleteById" parameterType="java.lang.Integer">
+
+    DELETE   /* getDelete+@@com.gxcx.firstpage.entity.OperationLog  */
+    FROM   grain_abnormal_describe                        /* 粮情描述 */
+    WHERE
+    grain_record_id =  #{id} /* 主键  id */
+    </delete>
+
+    <select  id="getSelectId" parameterType="java.lang.Integer" resultType="com.unissoft.model.GrainAbnormalDescribe">
+        select
+        pest_density as pestDensity,
+        occur_position as occurPosition,
+        occur_area as occurArea,
+        pest_type as  pestType,
+        abnormal_water as abnormalWater,
+        abnormal_grain as abnormalGrain
+        FROM   grain_abnormal_describe                        /* 粮情描述*/
+        WHERE
+        grain_record_id =  #{id} /* 主键  id */
+    </select>
+
 </mapper>

src/main/java/com/unissoft/mapper/GrainCheckChooseRecordMapper.java

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface GrainCheckChooseRecordMapper extends BaseMapper<GrainCheckChooseRecord> {
 
+    void getDeleteById(Integer id);
 }

src/main/java/com/unissoft/mapper/GrainCheckChooseRecordMapper.xml

@@ -17,4 +17,10 @@
         id, grain_record_id, check_list, choose, create_time, ready
     </sql>
 
+    <delete id="getDeleteById" parameterType="java.lang.Integer">
+    DELETE   /* getDelete+@@com.gxcx.firstpage.entity.OperationLog  */
+    FROM   grain_check_choose_record
+    WHERE
+    grain_record_id =  #{id}
+    </delete>
 </mapper>

src/main/java/com/unissoft/mapper/GrainConditionRecordMapper.java

@@ -18,5 +18,5 @@ public interface GrainConditionRecordMapper extends BaseMapper<GrainConditionRec
 
     List<GrainConditionRecord> getByCheckPersonAndCheckTime();
    // List<GrainConditionRecord> getByPersonAndTime();
-    int  getSelectId();
+    int  getSelectRecordId();
 }

src/main/java/com/unissoft/mapper/GrainConditionRecordMapper.xml

@@ -57,7 +57,7 @@
 
 
 
-    <select id="getSelectId"  resultType="java.lang.Integer">
-        SELECT last_insert_id();
+    <select id="getSelectRecordId"  resultType="java.lang.Integer" >
+         SELECT LAST_INSERT_ID()
     </select>
 </mapper>

src/main/java/com/unissoft/model/GrainAbnormalDescribe.java

@@ -59,5 +59,4 @@ public class GrainAbnormalDescribe implements Serializable {
     @TableField("abnormal_grain")
     private String abnormalGrain;
 
-
 }

src/main/java/com/unissoft/model/GrainCheckChooseRecord.java

@@ -2,10 +2,13 @@ package com.unissoft.model;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.unissoft.result.PageParam;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -23,7 +26,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = false)
 @TableName("grain_check_choose_record")
 @ApiModel(value="GrainCheckChooseRecord对象", description="")
-public class GrainCheckChooseRecord implements Serializable {
+public class  GrainCheckChooseRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -45,7 +48,9 @@ public class GrainCheckChooseRecord implements Serializable {
 
     @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
-    private Date createTime;
+    /*@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")*/
+    private String  createTime;
 
     @ApiModelProperty(value = "备用字段")
     @TableField("ready")

src/main/java/com/unissoft/model/GrainConditionRecord.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.sql.Blob;
@@ -36,8 +37,9 @@ public class GrainConditionRecord implements Serializable {
 
     @ApiModelProperty(value = "检查时间")
     @TableField("check_time")
-    @JsonFormat(locale="zh",shape=JsonFormat.Shape.STRING,pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date checkTime;
+    /*@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape=JsonFormat.Shape.STRING,pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")*/
+    private String  checkTime;
 
     @ApiModelProperty(value = "检查项")
     @TableField("check_list")
@@ -84,11 +86,6 @@ public class GrainConditionRecord implements Serializable {
     @TableField(exist = false)
     private String grainAbnormal;
 
-    public Date getCheckTime() {
-        return checkTime;
-    }
 
-    public void setCheckTime(Date checkTime) {
-        this.checkTime = checkTime;
-    }
+
 }

src/main/java/com/unissoft/model/GrainManageDictionary.java

@@ -55,5 +55,23 @@ public class GrainManageDictionary implements Serializable {
     @TableField("create_time")
     private Date createTime;
 
+    @ApiModelProperty(value = "是")
+    @TableField("status1")
+    private String status1;
 
+    @ApiModelProperty(value = "否")
+    @TableField("status2")
+    private String status2;
+
+    @ApiModelProperty(value = "达标、宜存/不达标、宜存/不达标、不宜存")
+    @TableField("status3")
+    private String status3;
+
+    @ApiModelProperty(value = "是,否")
+    @TableField(exist = false)
+    private whether whether;
+
+    @ApiModelProperty(value = "达标、宜存/不达标、宜存/不达标、不宜存")
+    @TableField(exist = false)
+    private String options;
 }