Merge remote-tracking branch 'origin/main'

main
862857010@qq.com 2 years ago
commit ecb70ee612
  1. 5
      cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/agriculturalused/AgriculturalUsedMapper.java
  2. 16
      cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/husbandryrecord/HusbandryRecordServiceImpl.java
  3. 2
      cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/husbandryrecord/HusbandryRecordMapper.xml

@ -7,8 +7,10 @@ import com.cjy.traceability.framework.common.pojo.PageResult;
import com.cjy.traceability.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.cjy.traceability.framework.mybatis.core.mapper.BaseMapperX;
import com.cjy.traceability.module.traceability.dal.dataobject.agriculturalused.AgriculturalUsedDO;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import com.cjy.traceability.module.traceability.controller.admin.agriculturalused.vo.*;
import org.apache.ibatis.annotations.Param;
/**
* 农资使用记录; Mapper
@ -36,4 +38,7 @@ public interface AgriculturalUsedMapper extends BaseMapperX<AgriculturalUsedDO>
);
}
@Delete(""+
"delete from traceability_agricultural_used where husbandry_id = #{husbandryId}")
boolean deleteByHusbandryId(@Param("husbandryId") Integer husbandryId);
}

@ -2,6 +2,7 @@ package com.cjy.traceability.module.traceability.service.husbandryrecord;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import com.cjy.traceability.module.traceability.dal.mysql.agriculturalused.AgriculturalUsedMapper;
import jodd.util.StringUtil;
import org.springframework.stereotype.Service;
@ -34,7 +35,8 @@ public class HusbandryRecordServiceImpl implements HusbandryRecordService {
@Resource
private HusbandryRecordMapper husbandryRecordMapper;
@Resource
private AgriculturalUsedMapper agriculturalUsedMapper;
@Override
public Integer createHusbandryRecord(HusbandryRecordSaveReqVO createReqVO) {
// 插入
@ -61,6 +63,18 @@ public class HusbandryRecordServiceImpl implements HusbandryRecordService {
// 更新
HusbandryRecordDO updateObj = BeanUtils.toBean(updateReqVO, HusbandryRecordDO.class);
husbandryRecordMapper.updateById(updateObj);
// 删除已添加农资记录
agriculturalUsedMapper.deleteByHusbandryId(updateReqVO.getHusbandryId());
if (StringUtil.isNotBlank(updateReqVO.getAgriculturalJson())) {
JSONArray jsonArray = new JSONArray(updateReqVO.getAgriculturalJson());
for (Object obj : jsonArray) {
JSONObject jsonObject = new JSONObject(obj);
jsonObject.put("creator", updateObj.getCreator());
jsonObject.put("updater", updateObj.getUpdater());
husbandryRecordMapper.insertAgriculturalUsed(updateReqVO.getHusbandryId(),jsonObject);
}
}
}
@Override

@ -90,7 +90,7 @@
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="json.id != null">#{json.agriculturalType},</if>
<if test="json.id != null">#{json.id},</if>
<if test="json.agriculturalName != null">#{json.agriculturalName},</if>
<if test="json.manufacturer != null">#{json.manufacturer},</if>
<if test="json.agriculturalUnit != null">#{json.agriculturalUnit},</if>

Loading…
Cancel
Save