种样品修改，新增创建人，同时插入农事记录

Administrator

2022-05-14 d103e2fb43071db94ba60c98045c80cf251bbfe8

种样品修改，新增创建人，同时插入农事记录

 src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java

@@ -26,9 +26,12 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.farm.entity.FarmingRecord;
import org.springblade.modules.farm.service.FarmingRecordService;
import org.springblade.modules.farmplant.entity.FarmPlant;
import org.springblade.modules.farmplant.service.FarmPlantService;
import org.springblade.modules.farmplant.vo.FarmPlantVO;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
@@ -45,6 +48,9 @@
public class FarmPlantController extends BladeController {

    private final FarmPlantService farmplantService;


    private final FarmingRecordService farmingRecordService;

    /**
     * 详情
@@ -84,10 +90,32 @@
     */
    @PostMapping("/save")
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入farmPlant")
    @Transactional(rollbackFor = Exception.class)
    public R save(@Valid @RequestBody FarmPlant farmPlant) {
        farmPlant.setCreateTime(new Date());
        return R.status(farmplantService.save(farmPlant));
        boolean save = farmplantService.save(farmPlant);
        if (save){
            //同时生成农事记录
            FarmingRecord record = new FarmingRecord();
            record.setCreateTime(new Date());
            record.setJobWay(farmPlant.getJobWay());
            record.setTime(farmPlant.getTransplanTime());
            if(farmPlant.getPlantingWay().equals("0")){
                //移栽
                record.setType("10");
            }
            if(farmPlant.getPlantingWay().equals("1")){
                //直播
                record.setType("11");
            }
            record.setLandId(farmPlant.getLandId());
            record.setTime(farmPlant.getTransplanTime());
            record.setOperator(farmPlant.getCreateUser());
            record.setRemarks("品种: "+farmPlant.getVarieties());
            //新增
            farmingRecordService.save(record);
        }
        return R.status(save);
    }

    /**

 src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java

@@ -114,4 +114,9 @@
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    /**
     * 操作人(创建人)
     */
    private String createUser;

}