填报调整

zhongrj

2023-09-05 2220383df9ee6bfbced20b83b83c90b6a68d995f

填报调整

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbAttResRsbNorspiController.java

@@ -10,6 +10,9 @@
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Map;


/**
 * @ClassName TbAttResRsbNorspiController
@@ -36,9 +39,10 @@
    @ApiOperation(value = "中台水库-查询水库填报详情信息", notes = "中台水库-查询水库填报详情信息")
    @GetMapping(value = "/getDetailByGuid")
    public R getDetailByCode(String resGuid) {
        TbAttResRsbNorspi attResBase = tbAttResRsbNorspiService.getDetailByGuid(resGuid);
        List<TbAttResRsbNorspi> attResBase = tbAttResRsbNorspiService.getDetailByGuid(resGuid);
        return R.data(attResBase);
    }


    /**
     * 编辑
@@ -47,7 +51,7 @@
     */
    @ApiOperation(value = "水库信息-编辑", notes = "水库信息-编辑")
    @PostMapping(value = "/edit")
    public R edit(@RequestBody TbAttResRsbNorspi tbAttResRsbNorspi) {
    public R edit(@RequestBody List<TbAttResRsbNorspi> tbAttResRsbNorspi) {
        return R.status(tbAttResRsbNorspiService.updateByGuid(tbAttResRsbNorspi));
    }

@@ -58,8 +62,42 @@
     */
    @ApiOperation(value = "水库信息-审核", notes = "水库信息-审核")
    @PostMapping(value = "/audit")
    public R audit(@RequestBody TbAttResRsbNorspi tbAttResRsbNorspi) {
    public R audit(@RequestBody List<TbAttResRsbNorspi> tbAttResRsbNorspi) {
        return R.status(tbAttResRsbNorspiService.auditByGuid(tbAttResRsbNorspi));
    }

    /**
     * 查询水库填报详情信息（正常，非常溢洪道，泄洪洞）
     * @param resGuid
     * @return
     */
    @ApiOperation(value = "中台水库-查询水库填报详情信息", notes = "中台水库-查询水库填报详情信息")
    @GetMapping(value = "/getResRsbNorsipiVerspiMionitorDetailByGuid")
    public R getResRsbNorsipiVerspiMionitorDetailByGuid(String resGuid) {
        Map<String,Object> map = tbAttResRsbNorspiService.getResRsbNorsipiVerspiMionitorDetailByGuid(resGuid);
        return R.data(map);
    }

    /**
     * 编辑（正常，非常溢洪道，泄洪洞）
     * @param map
     * @return
     */
    @ApiOperation(value = "水库信息-编辑", notes = "水库信息-编辑")
    @PostMapping(value = "/editResRsbNorsipiVerspiMionitor")
    public R editResRsbNorsipiVerspiMionitor(@RequestBody String map) {
        return R.status(tbAttResRsbNorspiService.editResRsbNorsipiVerspiMionitor(map));
    }

    /**
     * 审核（正常，非常溢洪道，泄洪洞）
     * @param map
     * @return
     */
    @ApiOperation(value = "水库信息-审核", notes = "水库信息-审核")
    @PostMapping(value = "/auditResRsbNorsipiVerspiMionitor")
    public R auditResRsbNorsipiVerspiMionitor(@RequestBody String map) {
        return R.status(tbAttResRsbNorspiService.auditResRsbNorsipiVerspiMionitor(map));
    }

}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbAttResRsbSpillwayController.java

@@ -10,6 +10,8 @@
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;

import java.util.List;


/**
 * @ClassName TbAttResRsbSpillwayController
@@ -36,7 +38,7 @@
    @ApiOperation(value = "中台水库-查询水库填报详情信息", notes = "中台水库-查询水库填报详情信息")
    @GetMapping(value = "/getDetailByGuid")
    public R getDetailByCode(String resGuid) {
        TbAttResRsbSpillway attResBase = tbAttResRsbSpillwayService.getDetailByGuid(resGuid);
        List<TbAttResRsbSpillway> attResBase = tbAttResRsbSpillwayService.getDetailByGuid(resGuid);
        return R.data(attResBase);
    }

@@ -47,7 +49,7 @@
     */
    @ApiOperation(value = "水库信息-编辑", notes = "水库信息-编辑")
    @PostMapping(value = "/edit")
    public R edit(@RequestBody TbAttResRsbSpillway tbAttResRsbSpillway) {
    public R edit(@RequestBody List<TbAttResRsbSpillway> tbAttResRsbSpillway) {
        return R.status(tbAttResRsbSpillwayService.updateByGuid(tbAttResRsbSpillway));
    }

@@ -58,7 +60,7 @@
     */
    @ApiOperation(value = "水库信息-审核", notes = "水库信息-审核")
    @PostMapping(value = "/audit")
    public R audit(@RequestBody TbAttResRsbSpillway tbAttResRsbSpillway) {
    public R audit(@RequestBody List<TbAttResRsbSpillway> tbAttResRsbSpillway) {
        return R.status(tbAttResRsbSpillwayService.auditByGuid(tbAttResRsbSpillway));
    }


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbAttResRsbVerspiController.java

@@ -10,6 +10,8 @@
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;

import java.util.List;


/**
 * @ClassName TbAttResRsbVerspiController
@@ -36,7 +38,7 @@
    @ApiOperation(value = "中台水库-查询水库填报详情信息", notes = "中台水库-查询水库填报详情信息")
    @GetMapping(value = "/getDetailByGuid")
    public R getDetailByCode(String resGuid) {
        TbAttResRsbVerspi attResBase = tbAttResRsbVerspiService.getDetailByGuid(resGuid);
        List<TbAttResRsbVerspi> attResBase = tbAttResRsbVerspiService.getDetailByGuid(resGuid);
        return R.data(attResBase);
    }

@@ -47,7 +49,7 @@
     */
    @ApiOperation(value = "水库信息-编辑", notes = "水库信息-编辑")
    @PostMapping(value = "/edit")
    public R edit(@RequestBody TbAttResRsbVerspi tbAttResRsbVerspi) {
    public R edit(@RequestBody List<TbAttResRsbVerspi> tbAttResRsbVerspi) {
        return R.status(tbAttResRsbVerspiService.updateByGuid(tbAttResRsbVerspi));
    }

@@ -58,7 +60,7 @@
     */
    @ApiOperation(value = "水库信息-审核", notes = "水库信息-审核")
    @PostMapping(value = "/audit")
    public R audit(@RequestBody TbAttResRsbVerspi tbAttResRsbVerspi) {
    public R audit(@RequestBody List<TbAttResRsbVerspi> tbAttResRsbVerspi) {
        return R.status(tbAttResRsbVerspiService.auditByGuid(tbAttResRsbVerspi));
    }


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbAttResWaterBlockController.java

@@ -10,6 +10,8 @@
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;

import java.util.List;


/**
 * @ClassName TbAttResWaterBlockController
@@ -36,7 +38,7 @@
    @ApiOperation(value = "中台水库-查询水库填报详情信息", notes = "中台水库-查询水库填报详情信息")
    @GetMapping(value = "/getDetailByGuid")
    public R getDetailByCode(String resGuid) {
        TbAttResWaterBlock attResBase = tbAttResWaterBlockService.getDetailByGuid(resGuid);
        List<TbAttResWaterBlock> attResBase = tbAttResWaterBlockService.getDetailByGuid(resGuid);
        return R.data(attResBase);
    }

@@ -47,7 +49,7 @@
     */
    @ApiOperation(value = "水库信息-编辑", notes = "水库信息-编辑")
    @PostMapping(value = "/edit")
    public R edit(@RequestBody TbAttResWaterBlock tbAttResWaterBlock) {
    public R edit(@RequestBody List<TbAttResWaterBlock> tbAttResWaterBlock) {
        return R.status(tbAttResWaterBlockService.updateByGuid(tbAttResWaterBlock));
    }

@@ -58,7 +60,7 @@
     */
    @ApiOperation(value = "水库信息-审核", notes = "水库信息-审核")
    @PostMapping(value = "/audit")
    public R audit(@RequestBody TbAttResWaterBlock tbAttResWaterBlock) {
    public R audit(@RequestBody List<TbAttResWaterBlock> tbAttResWaterBlock) {
        return R.status(tbAttResWaterBlockService.auditByGuid(tbAttResWaterBlock));
    }


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbAttResWaterDeliveryController.java

@@ -10,6 +10,8 @@
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;

import java.util.List;


/**
 * @ClassName TbAttResWaterDeliveryController
@@ -36,7 +38,7 @@
    @ApiOperation(value = "中台水库-查询水库填报详情信息", notes = "中台水库-查询水库填报详情信息")
    @GetMapping(value = "/getDetailByGuid")
    public R getDetailByCode(String resGuid) {
        TbAttResWaterDelivery attResBase = tbAttResWaterDeliveryService.getDetailByGuid(resGuid);
        List<TbAttResWaterDelivery> attResBase = tbAttResWaterDeliveryService.getDetailByGuid(resGuid);
        return R.data(attResBase);
    }

@@ -47,7 +49,7 @@
     */
    @ApiOperation(value = "水库信息-编辑", notes = "水库信息-编辑")
    @PostMapping(value = "/edit")
    public R edit(@RequestBody TbAttResWaterDelivery tbAttResWaterDelivery) {
    public R edit(@RequestBody List<TbAttResWaterDelivery> tbAttResWaterDelivery) {
        return R.status(tbAttResWaterDeliveryService.updateByGuid(tbAttResWaterDelivery));
    }

@@ -58,7 +60,7 @@
     */
    @ApiOperation(value = "水库信息-审核", notes = "水库信息-审核")
    @PostMapping(value = "/audit")
    public R audit(@RequestBody TbAttResWaterDelivery tbAttResWaterDelivery) {
    public R audit(@RequestBody List<TbAttResWaterDelivery> tbAttResWaterDelivery) {
        return R.status(tbAttResWaterDeliveryService.auditByGuid(tbAttResWaterDelivery));
    }


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbNorspi.java

@@ -43,6 +43,13 @@
    private String name;

    /**
     * 数量
     */
    @ApiModelProperty(value = "数量")
    @TableField("\"num\"")
    private Integer num;

    /**
     * 水库编码
     */
    @ApiModelProperty(value = "水库编码")
@@ -92,11 +99,25 @@
    private Integer workingGateType;

    /**
     * 闸门尺寸
     * 闸门数量
     */
    @ApiModelProperty(value = "闸门尺寸")
    @TableField("\"gate_size\"")
    private String gateSize;
    @ApiModelProperty(value = "闸门数量")
    @TableField("\"gate_num\"")
    private Integer gateNum;

    /**
     * 闸门长
     */
    @ApiModelProperty(value = "闸门长")
    @TableField("\"gate_length\"")
    private Double gateLength;

    /**
     * 闸门宽
     */
    @ApiModelProperty(value = "闸门宽")
    @TableField("\"gate_wide\"")
    private Double gateWide;

    /**
     * 最大泄洪流量

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbSpillway.java

@@ -43,6 +43,13 @@
    private String name;

    /**
     * 数量
     */
    @ApiModelProperty(value = "数量")
    @TableField("\"num\"")
    private Integer num;

    /**
     * 水库编码
     */
    @ApiModelProperty(value = "水库编码")
@@ -78,11 +85,25 @@
    private Double exportElevation;

    /**
     * 断面尺寸
     * 断面（孔洞）数量
     */
    @ApiModelProperty(value = "断面尺寸")
    @TableField("\"section_size\"")
    private Double sectionSize;
    @ApiModelProperty(value = "断面（孔洞）数量")
    @TableField("\"section_num\"")
    private Integer sectionNum;

    /**
     * 断面（孔洞）长度
     */
    @ApiModelProperty(value = "断面（孔洞）长度")
    @TableField("\"section_length\"")
    private Double sectionLength;

    /**
     * 断面（孔洞）宽度/直径
     */
    @ApiModelProperty(value = "断面（孔洞）宽度/直径")
    @TableField("\"section_wide\"")
    private Double sectionWide;

    /**
     * 最大泄洪流量
@@ -96,14 +117,14 @@
     */
    @ApiModelProperty(value = "工作闸门型式 ")
    @TableField("\"working_gate_type\"")
    private Integer workingGateType;
    private String workingGateType;

    /**
     * 启闭方式
     */
    @ApiModelProperty(value = "启闭方式 ")
    @TableField("\"oc_type\"")
    private Integer ocType;
    private String ocType;

    /**
     * 填报状态（0:填写中，1:审核中，2:审核通过）

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbVerspi.java

@@ -16,14 +16,14 @@
import java.util.Date;

/**
 * 中台水库非正常溢洪道填报实体类-填报
 * 中台水库非常溢洪道填报实体类-填报
 *
 * @author zhongrj
 * @date 2023-08-16
 */
@Data
@TableName("\"tb_att_res_rsb_verspi\"")
@ApiModel(value = "水库非正常溢洪道填报对象", description = "水库非正常溢洪道填报对象")
@ApiModel(value = "水库非常溢洪道填报对象", description = "水库非常溢洪道填报对象")
public class TbAttResRsbVerspi implements Serializable {
    private static final long serialVersionUID = 1L;

@@ -43,6 +43,13 @@
    private String name;

    /**
     * 数量
     */
    @ApiModelProperty(value = "数量")
    @TableField("\"num\"")
    private Integer num;

    /**
     * 水库编码
     */
    @ApiModelProperty(value = "水库编码")

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResSafetyMonitor.java

@@ -73,6 +73,13 @@
    private String surveyProblem;

    /**
     * 是否开展除险加固
     */
    @ApiModelProperty(value = "是否开展除险加固")
    @TableField("\"is_reinforce\"")
    private String isReinforce;

    /**
     * 填报状态（0:填写中，1:审核中，2:审核通过）
     */
    @ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ")

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterBlock.java

@@ -43,6 +43,13 @@
    private String name;

    /**
     * 数量
     */
    @ApiModelProperty(value = "数量")
    @TableField("\"num\"")
    private Integer num;

    /**
     * 水库编码
     */
    @ApiModelProperty(value = "水库编码")

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterDelivery.java

@@ -43,6 +43,13 @@
    private String name;

    /**
     * 数量
     */
    @ApiModelProperty(value = "数量")
    @TableField("\"num\"")
    private Integer num;

    /**
     * 水库编码
     */
    @ApiModelProperty(value = "水库编码")

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbAttResRsbNorspiMapper.java

@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;


/**
 * TbAttResRsbNorspiMapper 接口
@@ -20,5 +22,5 @@
     * @param resGuid
     * @return
     */
    TbAttResRsbNorspi getDetailByResGuid(@Param("resGuid") String resGuid);
    List<TbAttResRsbNorspi> getDetailByResGuid(@Param("resGuid") String resGuid);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbAttResRsbSpillwayMapper.java

@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;


/**
 * TbAttResRsbSpillwayMapper 接口
@@ -20,5 +22,5 @@
     * @param resGuid
     * @return
     */
    TbAttResRsbSpillway getDetailByResGuid(@Param("resGuid") String resGuid);
    List<TbAttResRsbSpillway> getDetailByResGuid(@Param("resGuid") String resGuid);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbAttResRsbVerspiMapper.java

@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;


/**
 * TbAttResRsbVerspiMapper 接口
@@ -20,5 +22,5 @@
     * @param resGuid
     * @return
     */
    TbAttResRsbVerspi getDetailByResGuid(@Param("resGuid") String resGuid);
    List<TbAttResRsbVerspi> getDetailByResGuid(@Param("resGuid") String resGuid);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbAttResWaterBlockMapper.java

@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;


/**
 * TbAttResWaterBlockMapper 接口
@@ -20,5 +22,5 @@
     * @param resGuid
     * @return
     */
    TbAttResWaterBlock getDetailByResGuid(@Param("resGuid") String resGuid);
    List<TbAttResWaterBlock> getDetailByResGuid(@Param("resGuid") String resGuid);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbAttResWaterDeliveryMapper.java

@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;


/**
 * TbAttResWaterDeliveryMapper 接口
@@ -20,5 +22,5 @@
     * @param resGuid
     * @return
     */
    TbAttResWaterDelivery getDetailByResGuid(@Param("resGuid") String resGuid);
    List<TbAttResWaterDelivery> getDetailByResGuid(@Param("resGuid") String resGuid);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbAttResRsbNorspiService.java

@@ -3,6 +3,9 @@
import cn.gistack.sm.sjztmd.entity.TbAttResRsbNorspi;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;
import java.util.Map;

/**
 * @ClassName ITbAttResRsbNorspiService
 * @Description TODO
@@ -17,19 +20,40 @@
     * @param guid
     * @return
     */
    TbAttResRsbNorspi getDetailByGuid(String guid);
    List<TbAttResRsbNorspi> getDetailByGuid(String guid);

    /**
     * 编辑
     * @param tbAttResRsbNorspi
     * @return
     */
    boolean updateByGuid(TbAttResRsbNorspi tbAttResRsbNorspi);
    boolean updateByGuid(List<TbAttResRsbNorspi> tbAttResRsbNorspi);

    /**
     * 审核
     * @param tbAttResRsbNorspi
     * @return
     */
    boolean auditByGuid(TbAttResRsbNorspi tbAttResRsbNorspi);
    boolean auditByGuid(List<TbAttResRsbNorspi> tbAttResRsbNorspi);

    /**
     * 查询水库填报详情信息（正常，非常溢洪道，泄洪洞）
     * @param resGuid
     * @return
     */
    Map<String,Object> getResRsbNorsipiVerspiMionitorDetailByGuid(String resGuid);

    /**
     * 编辑（正常，非常溢洪道，泄洪洞）
     * @param map
     * @return
     */
    boolean editResRsbNorsipiVerspiMionitor(String map);

    /**
     * 审核（正常，非常溢洪道，泄洪洞）
     * @param map
     * @return
     */
    boolean auditResRsbNorsipiVerspiMionitor(String map);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbAttResRsbSpillwayService.java

@@ -3,6 +3,8 @@
import cn.gistack.sm.sjztmd.entity.TbAttResRsbSpillway;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

/**
 * @ClassName ITbAttResRsbSpillwayService
 * @Description TODO
@@ -17,19 +19,19 @@
     * @param guid
     * @return
     */
    TbAttResRsbSpillway getDetailByGuid(String guid);
    List<TbAttResRsbSpillway> getDetailByGuid(String guid);

    /**
     * 编辑
     * @param tbAttResRsbSpillway
     * @return
     */
    boolean updateByGuid(TbAttResRsbSpillway tbAttResRsbSpillway);
    boolean updateByGuid(List<TbAttResRsbSpillway> tbAttResRsbSpillway);

    /**
     * 审核
     * @param tbAttResRsbSpillway
     * @return
     */
    boolean auditByGuid(TbAttResRsbSpillway tbAttResRsbSpillway);
    boolean auditByGuid(List<TbAttResRsbSpillway> tbAttResRsbSpillway);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbAttResRsbVerspiService.java

@@ -3,6 +3,8 @@
import cn.gistack.sm.sjztmd.entity.TbAttResRsbVerspi;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

/**
 * @ClassName ITbAttResRsbVerspiService
 * @Description TODO
@@ -17,19 +19,19 @@
     * @param guid
     * @return
     */
    TbAttResRsbVerspi getDetailByGuid(String guid);
    List<TbAttResRsbVerspi> getDetailByGuid(String guid);

    /**
     * 编辑
     * @param tbAttResRsbVerspi
     * @return
     */
    boolean updateByGuid(TbAttResRsbVerspi tbAttResRsbVerspi);
    boolean updateByGuid(List<TbAttResRsbVerspi> tbAttResRsbVerspi);

    /**
     * 审核
     * @param tbAttResRsbVerspi
     * @return
     */
    boolean auditByGuid(TbAttResRsbVerspi tbAttResRsbVerspi);
    boolean auditByGuid(List<TbAttResRsbVerspi> tbAttResRsbVerspi);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbAttResWaterBlockService.java

@@ -3,6 +3,8 @@
import cn.gistack.sm.sjztmd.entity.TbAttResWaterBlock;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

/**
 * @ClassName ITbAttResWaterBlockService
 * @Description TODO
@@ -17,19 +19,19 @@
     * @param guid
     * @return
     */
    TbAttResWaterBlock getDetailByGuid(String guid);
    List<TbAttResWaterBlock> getDetailByGuid(String guid);

    /**
     * 编辑
     * @param tbAttResWaterBlock
     * @return
     */
    boolean updateByGuid(TbAttResWaterBlock tbAttResWaterBlock);
    boolean updateByGuid(List<TbAttResWaterBlock> tbAttResWaterBlock);

    /**
     * 审核
     * @param tbAttResWaterBlock
     * @return
     */
    boolean auditByGuid(TbAttResWaterBlock tbAttResWaterBlock);
    boolean auditByGuid(List<TbAttResWaterBlock> tbAttResWaterBlock);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbAttResWaterDeliveryService.java

@@ -3,6 +3,8 @@
import cn.gistack.sm.sjztmd.entity.TbAttResWaterDelivery;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

/**
 * @ClassName ITbAttResWaterDeliveryService
 * @Description TODO
@@ -17,19 +19,19 @@
     * @param guid
     * @return
     */
    TbAttResWaterDelivery getDetailByGuid(String guid);
    List<TbAttResWaterDelivery> getDetailByGuid(String guid);

    /**
     * 编辑
     * @param tbAttResWaterDelivery
     * @return
     */
    boolean updateByGuid(TbAttResWaterDelivery tbAttResWaterDelivery);
    boolean updateByGuid(List<TbAttResWaterDelivery> tbAttResWaterDelivery);

    /**
     * 审核
     * @param tbAttResWaterDelivery
     * @return
     */
    boolean auditByGuid(TbAttResWaterDelivery tbAttResWaterDelivery);
    boolean auditByGuid(List<TbAttResWaterDelivery> tbAttResWaterDelivery);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbNorspiServiceImpl.java

@@ -1,17 +1,32 @@
package cn.gistack.sm.sjztmd.service.impl;

import cn.gistack.sm.sjztmd.entity.TbAttResRsbNorspi;
import cn.gistack.sm.sjztmd.entity.TbAttResRsbNorspi;
import cn.gistack.sm.sjztmd.entity.TbAttResRsbSpillway;
import cn.gistack.sm.sjztmd.entity.TbAttResRsbVerspi;
import cn.gistack.sm.sjztmd.mapper.TbAttResRsbNorspiMapper;
import cn.gistack.sm.sjztmd.mapper.TbAttResRsbVerspiMapper;
import cn.gistack.sm.sjztmd.service.ITbAttResRsbNorspiService;
import cn.gistack.sm.sjztmd.service.ITbAttResRsbSpillwayService;
import cn.gistack.sm.sjztmd.service.ITbAttResRsbVerspiService;
import cn.gistack.system.user.feign.IUserClient;
import com.alibaba.fastjson.JSON;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springblade.core.secure.utils.AuthUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import springfox.documentation.spring.web.json.Json;

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.*;
import java.util.stream.Collectors;

/**
 * @ClassName TbAttResRsbNorspiServiceImpl
@@ -27,168 +42,322 @@
    @Autowired
    private IUserClient userClient;

    @Autowired
    private ITbAttResRsbVerspiService tbAttResRsbVerspiService;

    @Autowired
    private ITbAttResRsbSpillwayService tbAttResRsbSpillwayService;

    /**
     * 查询水库填报详情信息
     * @param guid
     * @return
     */
    @Override
    public TbAttResRsbNorspi getDetailByGuid(String guid) {
    public List<TbAttResRsbNorspi> getDetailByGuid(String guid) {
        return baseMapper.getDetailByResGuid(guid);
    }

    /**
     * 编辑
     * @param tbAttResRsbNorspi
     * @param newList
     * @return
     */
    @Override
    public boolean updateByGuid(TbAttResRsbNorspi tbAttResRsbNorspi) {
    public boolean updateByGuid(List<TbAttResRsbNorspi> newList) {
        String resGuid = newList.get(0).getResGuid();
        // 查询是否存在
        TbAttResRsbNorspi detail = baseMapper.getDetailByResGuid(tbAttResRsbNorspi.getResGuid());
        List<TbAttResRsbNorspi> oldList = baseMapper.getDetailByResGuid(resGuid);
        // 更新日志
        setUpdateLog(detail,tbAttResRsbNorspi);
        // 修改
        int i = addOrUpdateByGuid(detail,tbAttResRsbNorspi);
        if (i>0){
        setUpdateLog(oldList,newList);
        // 创建或更新数据
        boolean flag = addOrUpdate(oldList,newList);
        // 返回
        return flag;
    }

    /**
     * 新增或更新数据
     * @param oldList
     * @param newList
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public boolean addOrUpdate(List<TbAttResRsbNorspi> oldList,List<TbAttResRsbNorspi> newList) {
        // 取旧数据和新提交数据差集--删除
        // 去除前一天已填报的人员手机号集合
        List<TbAttResRsbNorspi> removeList = oldList.stream().filter(vo -> !newList.stream().map(e ->
            e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
        // 取旧数据和新提交数据交集--更新
        List<TbAttResRsbNorspi> updateList = newList.stream().filter(vo -> oldList.stream().map(e ->
            e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
        // 取新数提交据和旧数据交集--新增
        List<TbAttResRsbNorspi> addList = newList.stream().filter(vo -> !oldList.stream().map(e ->
            e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
        boolean addFlag = true;
        boolean updateFlag = true;
        boolean removeFlag = true;
        if (addList.size()>0){
            // 批量新增
            addFlag = saveBatch(addList);
        }
        if (updateList.size()>0){
            // 批量更新
            addFlag = updateBatchById(updateList);
        }
        if (removeList.size()>0){
            // 批量删除
            removeFlag = removeBatchByIds(removeList);
        }
        if (addFlag && updateFlag && removeFlag){
            return true;
        }
        // 返回
        return false;
    }

    /**
     * 审核
     * @param tbAttResRsbNorspi
     * @param newList
     * @return
     */
    @Override
    public boolean auditByGuid(TbAttResRsbNorspi tbAttResRsbNorspi) {
    public boolean auditByGuid(List<TbAttResRsbNorspi> newList) {
        // 查询是否存在
        TbAttResRsbNorspi detail = baseMapper.getDetailByResGuid(tbAttResRsbNorspi.getResGuid());
        List<TbAttResRsbNorspi> oldList = baseMapper.getDetailByResGuid(newList.get(0).getResGuid());
        // 更新操作日志
        setUpdateLog(detail,tbAttResRsbNorspi);
        setUpdateLog(oldList,newList);
        // 更新审核日志
        setUpdateCheckLog(detail,tbAttResRsbNorspi);
        if (null!=detail){
            tbAttResRsbNorspi.setGuid(detail.getGuid());
        }
        // 驳回情况下将状态修改回0即已填写未提交状态
        if (tbAttResRsbNorspi.getCheckState()==3){
            tbAttResRsbNorspi.setCheckState(0);
        }
        setUpdateCheckLog(oldList,newList);
        // 更新数据
        int i = baseMapper.updateById(tbAttResRsbNorspi);
        if (i>0){
        boolean batch = updateBatchById(newList);
        // 返回
        return batch;
    }

    /**
     * @param oldList
     * @param newList
     * 更新审核记录
     */
    private void setUpdateCheckLog(List<TbAttResRsbNorspi> oldList,List<TbAttResRsbNorspi> newList) {
        // 遍历
        for (TbAttResRsbNorspi newTbAttResRsbNorspi : newList) {
            String fillName = "";
            if (newTbAttResRsbNorspi.getCheckState() == 2) {
                fillName = "审核";
            }
            if (newTbAttResRsbNorspi.getCheckState() == 3) {
                fillName = "退回" + (null == newTbAttResRsbNorspi.getCheckLog() ? "" : ":" + newTbAttResRsbNorspi.getCheckLog());
                for (TbAttResRsbNorspi tbAttResRsbNorspi : oldList) {
                    if (tbAttResRsbNorspi.getGuid().equals(newTbAttResRsbNorspi.getGuid())){
                        // 退回时进行设置状态为填写中
                        newTbAttResRsbNorspi.setCheckState(0);
                    }
                }
            }

            // 拼接
            String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
            String userName = AuthUtil.getUser().getUserName();
            String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
            StringBuilder builder = new StringBuilder();
            builder.append(time)
                .append(",")
                .append(fillName)
                .append(",")
                .append(userName)
                .append(",")
                .append(phone)
                .append(";");
            // 判断是否存在
            if (null==newTbAttResRsbNorspi.getGuid() || newTbAttResRsbNorspi.getGuid().equals("")){
                // 填报
                newTbAttResRsbNorspi.setCheckLog(builder.toString());
            } else {
                for (TbAttResRsbNorspi tbAttResRsbNorspi : oldList) {
                    if (tbAttResRsbNorspi.getGuid().equals(newTbAttResRsbNorspi.getGuid())){
                        StringBuilder stringBuilder = new StringBuilder(null == tbAttResRsbNorspi.getCheckLog() ? "" : tbAttResRsbNorspi.getCheckLog());
                        stringBuilder.append(builder);
                        // 填报
                        newTbAttResRsbNorspi.setCheckLog(stringBuilder.toString());
                    }
                }
            }
        }
    }

    /**
     * @param oldList
     * @param newList
     * 更新操作记录
     */
    private void setUpdateLog(List<TbAttResRsbNorspi> oldList,List<TbAttResRsbNorspi> newList) {
        // 遍历
        for (TbAttResRsbNorspi newTbAttResRsbNorspi : newList){
            String fillName = "";
            if (newTbAttResRsbNorspi.getCheckState()==0){
                fillName = "编辑";
            }
            if (newTbAttResRsbNorspi.getCheckState()==1){
                fillName = "提交";
            }
            if (newTbAttResRsbNorspi.getCheckState()==2){
                fillName = "审核";
            }
            if (newTbAttResRsbNorspi.getCheckState()==3){
                fillName = "退回" + (null==newTbAttResRsbNorspi.getCheckLog()?"":":" + newTbAttResRsbNorspi.getCheckLog());
            }
            // 管理员编辑
            if (newTbAttResRsbNorspi.getCheckState()==4){
                fillName = "编辑";
                // 找到相关的 guid 数据
                for (TbAttResRsbNorspi tbAttResRsbNorspi : oldList) {
                    if (tbAttResRsbNorspi.getGuid().equals(newTbAttResRsbNorspi.getGuid())){
                        newTbAttResRsbNorspi.setCheckState(tbAttResRsbNorspi.getCheckState());
                    }
                }
            }

            // 拼接
            String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
            String userName = AuthUtil.getUser().getUserName();
            String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
            StringBuilder builder = new StringBuilder();
            builder.append(time)
                .append(",")
                .append(fillName)
                .append(",")
                .append(userName)
                .append(",")
                .append(phone)
                .append(";");
            // 判断是否存在
            if (null==newTbAttResRsbNorspi.getGuid() || newTbAttResRsbNorspi.getGuid().equals("")){
                // 填报
                newTbAttResRsbNorspi.setLog(builder.toString());
            }else {
                for (TbAttResRsbNorspi tbAttResRsbNorspi : oldList) {
                    if (tbAttResRsbNorspi.getGuid().equals(newTbAttResRsbNorspi.getGuid())){
                        StringBuilder stringBuilder = new StringBuilder(null==tbAttResRsbNorspi.getLog()?"":tbAttResRsbNorspi.getLog());
                        stringBuilder.append(builder);
                        // 填报
                        newTbAttResRsbNorspi.setLog(stringBuilder.toString());
                    }
                }
            }
        }
    }

    /**
     * 查询水库填报详情信息（正常，非常溢洪道，泄洪洞）
     * @param resGuid
     * @return
     */
    @Override
    public Map<String,Object> getResRsbNorsipiVerspiMionitorDetailByGuid(String resGuid) {
        Map<String, Object> map = new HashMap<>();
        // 查询正常溢洪道信息
        List<TbAttResRsbNorspi> tbAttResRsbNorspiList = baseMapper.getDetailByResGuid(resGuid);
        // 查询非常溢洪道信息
        List<TbAttResRsbVerspi> tbAttResRsbVerspiList = tbAttResRsbVerspiService.getDetailByGuid(resGuid);
        // 查询泄洪洞信息
        List<TbAttResRsbSpillway> tbAttResRsbSpillwayList = tbAttResRsbSpillwayService.getDetailByGuid(resGuid);
        // 封装数据
        map.put("tbAttResRsbNorspiList",tbAttResRsbNorspiList);
        map.put("tbAttResRsbVerspiList",tbAttResRsbVerspiList);
        map.put("tbAttResRsbSpillwayList",tbAttResRsbSpillwayList);
        // 返回
        return map;
    }

    /**
     * 编辑（正常，非常溢洪道，泄洪洞）
     * @param map
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean editResRsbNorsipiVerspiMionitor(String map) {
        ObjectMapper objectMapper = new ObjectMapper();
        JsonNode jsonNode = null;
        try {
            jsonNode = objectMapper.readTree(map);
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }
        JsonNode tbAttResRsbNorspiListJsonNode = jsonNode.get("tbAttResRsbNorspiList");
        JsonNode tbAttResRsbVerspiListJsonNode = jsonNode.get("tbAttResRsbVerspiList");
        JsonNode tbAttResRsbSpillwayListJsonNode = jsonNode.get("tbAttResRsbSpillwayList");

        JavaType tbAttResRsbNorspiType = objectMapper.getTypeFactory().constructParametricType(List.class, TbAttResRsbNorspi.class);
        JavaType tbAttResRsbVerspiType = objectMapper.getTypeFactory().constructParametricType(List.class, TbAttResRsbVerspi.class);
        JavaType tbAttResRsbSpillwayType = objectMapper.getTypeFactory().constructParametricType(List.class, TbAttResRsbSpillway.class);

        List<TbAttResRsbNorspi> tbAttResRsbNorspiList = null;
        List<TbAttResRsbVerspi> tbAttResRsbVerspiList = null;
        List<TbAttResRsbSpillway> tbAttResRsbSpillwayList = null;
        try {
            tbAttResRsbNorspiList = objectMapper.readValue(tbAttResRsbNorspiListJsonNode.toString(), tbAttResRsbNorspiType);
            tbAttResRsbVerspiList = objectMapper.readValue(tbAttResRsbVerspiListJsonNode.toString(), tbAttResRsbVerspiType);
            tbAttResRsbSpillwayList = objectMapper.readValue(tbAttResRsbSpillwayListJsonNode.toString(), tbAttResRsbSpillwayType);
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }
        // 取出集合数据,这样转换格式异常
//        List<TbAttResRsbNorspi> tbAttResRsbNorspiList = (List<TbAttResRsbNorspi>)map.get("tbAttResRsbNorspiList");
//        List<TbAttResRsbVerspi> tbAttResRsbVerspiList = (List<TbAttResRsbVerspi>)map.get("tbAttResRsbVerspiList");
//        List<TbAttResRsbSpillway> tbAttResRsbSpillwayList = (List<TbAttResRsbSpillway>)map.get("tbAttResRsbSpillwayList");
        // 分别更新
        boolean flag1 = updateByGuid(tbAttResRsbNorspiList);
        boolean flag2 = tbAttResRsbVerspiService.updateByGuid(tbAttResRsbVerspiList);
        boolean flag3 = tbAttResRsbSpillwayService.updateByGuid(tbAttResRsbSpillwayList);
        if (flag1 && flag2 && flag3){
            return true;
        }
        return false;
    }

    /**
     * 更新
     * @param tbAttResRsbNorspi
     * 审核（正常，非常溢洪道，泄洪洞）
     * @param map
     * @return
     */
    private int addOrUpdateByGuid(TbAttResRsbNorspi oldAbAttResBase,TbAttResRsbNorspi tbAttResRsbNorspi){
        int i = 0;
        if (null!=oldAbAttResBase){
            tbAttResRsbNorspi.setGuid(oldAbAttResBase.getGuid());
            // 更新
            i = baseMapper.updateById(tbAttResRsbNorspi);
        }else {
            tbAttResRsbNorspi.setCreateTime(new Date());
            i = baseMapper.insert(tbAttResRsbNorspi);
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean auditResRsbNorsipiVerspiMionitor(String map) {
        ObjectMapper objectMapper = new ObjectMapper();
        JsonNode jsonNode = null;
        try {
            jsonNode = objectMapper.readTree(map);
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }
        // 返回
        return i;
    }
        JsonNode tbAttResRsbNorspiListJsonNode = jsonNode.get("tbAttResRsbNorspiList");
        JsonNode tbAttResRsbVerspiListJsonNode = jsonNode.get("tbAttResRsbVerspiList");
        JsonNode tbAttResRsbSpillwayListJsonNode = jsonNode.get("tbAttResRsbSpillwayList");

    /**
     * @param oldAbAttResBase
     * @param newTbAttResRsbNorspi
     * 更新审核记录
     */
    private void setUpdateCheckLog(TbAttResRsbNorspi oldAbAttResBase,TbAttResRsbNorspi newTbAttResRsbNorspi) {
        String fillName = "";
        if (newTbAttResRsbNorspi.getCheckState()==2){
            fillName = "审核";
        }
        if (newTbAttResRsbNorspi.getCheckState()==3){
            fillName = "退回" + (null==newTbAttResRsbNorspi.getCheckLog()?"":":" + newTbAttResRsbNorspi.getCheckLog());
        }
        JavaType tbAttResRsbNorspiType = objectMapper.getTypeFactory().constructParametricType(List.class, TbAttResRsbNorspi.class);
        JavaType tbAttResRsbVerspiType = objectMapper.getTypeFactory().constructParametricType(List.class, TbAttResRsbVerspi.class);
        JavaType tbAttResRsbSpillwayType = objectMapper.getTypeFactory().constructParametricType(List.class, TbAttResRsbSpillway.class);

        // 拼接
        String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
        String userName = AuthUtil.getUser().getUserName();
        String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
        StringBuilder builder = new StringBuilder();
        builder.append(time)
            .append(",")
            .append(fillName)
            .append(",")
            .append(userName)
            .append(",")
            .append(phone)
            .append(";");
        // 判断是否存在
        if (null==oldAbAttResBase){
            // 填报
            newTbAttResRsbNorspi.setCheckLog(builder.toString());
        }else {
            StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getCheckLog()?"":oldAbAttResBase.getCheckLog());
            stringBuilder.append(builder);
            // 填报
            newTbAttResRsbNorspi.setCheckLog(stringBuilder.toString());
        List<TbAttResRsbNorspi> tbAttResRsbNorspiList = null;
        List<TbAttResRsbVerspi> tbAttResRsbVerspiList = null;
        List<TbAttResRsbSpillway> tbAttResRsbSpillwayList = null;
        try {
            tbAttResRsbNorspiList = objectMapper.readValue(tbAttResRsbNorspiListJsonNode.toString(), tbAttResRsbNorspiType);
            tbAttResRsbVerspiList = objectMapper.readValue(tbAttResRsbVerspiListJsonNode.toString(), tbAttResRsbVerspiType);
            tbAttResRsbSpillwayList = objectMapper.readValue(tbAttResRsbSpillwayListJsonNode.toString(), tbAttResRsbSpillwayType);
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }
    }

    /**
     * @param oldAbAttResBase
     * @param newTbAttResRsbNorspi
     * 更新操作记录
     */
    private void setUpdateLog(TbAttResRsbNorspi oldAbAttResBase,TbAttResRsbNorspi newTbAttResRsbNorspi) {
        String fillName = "";
        if (newTbAttResRsbNorspi.getCheckState()==0){
            fillName = "编辑";
        // 分别更新
        boolean flag1 = auditByGuid(tbAttResRsbNorspiList);
        boolean flag2 = tbAttResRsbVerspiService.auditByGuid(tbAttResRsbVerspiList);
        boolean flag3 = tbAttResRsbSpillwayService.auditByGuid(tbAttResRsbSpillwayList);
        if (flag1 && flag2 && flag3){
            return true;
        }
        if (newTbAttResRsbNorspi.getCheckState()==1){
            fillName = "提交";
        }
        if (newTbAttResRsbNorspi.getCheckState()==2){
            fillName = "审核";
        }
        if (newTbAttResRsbNorspi.getCheckState()==3){
            fillName = "退回" + (null==newTbAttResRsbNorspi.getCheckLog()?"":":" + newTbAttResRsbNorspi.getCheckLog());
        }
        // 管理员编辑
        if (newTbAttResRsbNorspi.getCheckState()==4){
            fillName = "编辑";
            newTbAttResRsbNorspi.setCheckState(oldAbAttResBase.getCheckState());
        }

        // 拼接
        String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
        String userName = AuthUtil.getUser().getUserName();
        String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
        StringBuilder builder = new StringBuilder();
        builder.append(time)
            .append(",")
            .append(fillName)
            .append(",")
            .append(userName)
            .append(",")
            .append(phone)
            .append(";");
        // 判断是否存在
        if (null==oldAbAttResBase){
            // 填报
            newTbAttResRsbNorspi.setLog(builder.toString());
        }else {
            StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getLog()?"":oldAbAttResBase.getLog());
            stringBuilder.append(builder);
            // 填报
            newTbAttResRsbNorspi.setLog(stringBuilder.toString());
        }
        return false;
    }
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbSpillwayServiceImpl.java

@@ -1,6 +1,7 @@
package cn.gistack.sm.sjztmd.service.impl;

import cn.gistack.sm.sjztmd.entity.TbAttResRsbSpillway;
import cn.gistack.sm.sjztmd.entity.TbAttResRsbSpillway;
import cn.gistack.sm.sjztmd.mapper.TbAttResRsbSpillwayMapper;
import cn.gistack.sm.sjztmd.service.ITbAttResRsbSpillwayService;
import cn.gistack.system.user.feign.IUserClient;
@@ -9,9 +10,12 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

/**
 * @ClassName TbAttResRsbSpillwayServiceImpl
@@ -33,162 +37,197 @@
     * @return
     */
    @Override
    public TbAttResRsbSpillway getDetailByGuid(String guid) {
    public List<TbAttResRsbSpillway> getDetailByGuid(String guid) {
        return baseMapper.getDetailByResGuid(guid);
    }

    /**
     * 编辑
     * @param tbAttResRsbSpillway
     * @param newList
     * @return
     */
    @Override
    public boolean updateByGuid(TbAttResRsbSpillway tbAttResRsbSpillway) {
    public boolean updateByGuid(List<TbAttResRsbSpillway> newList) {
        // 查询是否存在
        TbAttResRsbSpillway detail = baseMapper.getDetailByResGuid(tbAttResRsbSpillway.getResGuid());
        List<TbAttResRsbSpillway> oldList = baseMapper.getDetailByResGuid(newList.get(0).getResGuid());
        // 更新日志
        setUpdateLog(detail,tbAttResRsbSpillway);
        // 修改
        int i = addOrUpdateByGuid(detail,tbAttResRsbSpillway);
        if (i>0){
        setUpdateLog(oldList,newList);
        // 创建或更新数据
        boolean flag = addOrUpdate(oldList,newList);
        // 返回
        return flag;
    }

    /**
     * 新增或更新数据
     * @param oldList
     * @param newList
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public boolean addOrUpdate(List<TbAttResRsbSpillway> oldList,List<TbAttResRsbSpillway> newList) {
        // 取旧数据和新提交数据差集--删除
        // 去除前一天已填报的人员手机号集合
        List<TbAttResRsbSpillway> removeList = oldList.stream().filter(vo -> !newList.stream().map(e ->
            e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
        // 取旧数据和新提交数据交集--更新
        List<TbAttResRsbSpillway> updateList = newList.stream().filter(vo -> oldList.stream().map(e ->
            e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
        // 取新数提交据和旧数据交集--新增
        List<TbAttResRsbSpillway> addList = newList.stream().filter(vo -> !oldList.stream().map(e ->
            e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
        boolean addFlag = true;
        boolean updateFlag = true;
        boolean removeFlag = true;
        if (addList.size()>0){
            // 批量新增
            addFlag = saveBatch(addList);
        }
        if (updateList.size()>0){
            // 批量更新
            addFlag = updateBatchById(updateList);
        }
        if (removeList.size()>0){
            // 批量删除
            removeFlag = removeBatchByIds(removeList);
        }
        if (addFlag && updateFlag && removeFlag){
            return true;
        }
        // 返回
        return false;
    }

    /**
     * 审核
     * @param tbAttResRsbSpillway
     * @param newList
     * @return
     */
    @Override
    public boolean auditByGuid(TbAttResRsbSpillway tbAttResRsbSpillway) {
    public boolean auditByGuid(List<TbAttResRsbSpillway> newList) {
        // 查询是否存在
        TbAttResRsbSpillway detail = baseMapper.getDetailByResGuid(tbAttResRsbSpillway.getResGuid());
        List<TbAttResRsbSpillway> oldList = baseMapper.getDetailByResGuid(newList.get(0).getResGuid());
        // 更新操作日志
        setUpdateLog(detail,tbAttResRsbSpillway);
        setUpdateLog(oldList,newList);
        // 更新审核日志
        setUpdateCheckLog(detail,tbAttResRsbSpillway);
        if (null!=detail){
            tbAttResRsbSpillway.setGuid(detail.getGuid());
        }
        // 驳回情况下将状态修改回0即已填写未提交状态
        if (tbAttResRsbSpillway.getCheckState()==3){
            tbAttResRsbSpillway.setCheckState(0);
        }
        setUpdateCheckLog(oldList,newList);
        // 更新数据
        int i = baseMapper.updateById(tbAttResRsbSpillway);
        if (i>0){
            return true;
        }
        return false;
    }

    /**
     * 更新
     * @param tbAttResRsbSpillway
     * @return
     */
    private int addOrUpdateByGuid(TbAttResRsbSpillway oldAbAttResBase,TbAttResRsbSpillway tbAttResRsbSpillway){
        int i = 0;
        if (null!=oldAbAttResBase){
            tbAttResRsbSpillway.setGuid(oldAbAttResBase.getGuid());
            // 更新
            i = baseMapper.updateById(tbAttResRsbSpillway);
        }else {
            tbAttResRsbSpillway.setCreateTime(new Date());
            i = baseMapper.insert(tbAttResRsbSpillway);
        }
        boolean batch = updateBatchById(newList);
        // 返回
        return i;
        return batch;
    }

    /**
     * @param oldAbAttResBase
     * @param newTbAttResRsbSpillway
     * @param oldList
     * @param newList
     * 更新审核记录
     */
    private void setUpdateCheckLog(TbAttResRsbSpillway oldAbAttResBase,TbAttResRsbSpillway newTbAttResRsbSpillway) {
        String fillName = "";
        if (newTbAttResRsbSpillway.getCheckState()==2){
            fillName = "审核";
        }
        if (newTbAttResRsbSpillway.getCheckState()==3){
            fillName = "退回" + (null==newTbAttResRsbSpillway.getCheckLog()?"":":" + newTbAttResRsbSpillway.getCheckLog());
        }
    private void setUpdateCheckLog(List<TbAttResRsbSpillway> oldList,List<TbAttResRsbSpillway> newList) {
        // 遍历
        for (TbAttResRsbSpillway newTbAttResRsbSpillway : newList) {
            String fillName = "";
            if (newTbAttResRsbSpillway.getCheckState() == 2) {
                fillName = "审核";
            }
            if (newTbAttResRsbSpillway.getCheckState() == 3) {
                fillName = "退回" + (null == newTbAttResRsbSpillway.getCheckLog() ? "" : ":" + newTbAttResRsbSpillway.getCheckLog());
                for (TbAttResRsbSpillway tbAttResRsbSpillway : oldList) {
                    if (tbAttResRsbSpillway.getGuid().equals(newTbAttResRsbSpillway.getGuid())){
                        // 退回时进行设置状态为填写中
                        newTbAttResRsbSpillway.setCheckState(0);
                    }
                }
            }

        // 拼接
        String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
        String userName = AuthUtil.getUser().getUserName();
        String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
        StringBuilder builder = new StringBuilder();
        builder.append(time)
            .append(",")
            .append(fillName)
            .append(",")
            .append(userName)
            .append(",")
            .append(phone)
            .append(";");
        // 判断是否存在
        if (null==oldAbAttResBase){
            // 填报
            newTbAttResRsbSpillway.setCheckLog(builder.toString());
        }else {
            StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getCheckLog()?"":oldAbAttResBase.getCheckLog());
            stringBuilder.append(builder);
            // 填报
            newTbAttResRsbSpillway.setCheckLog(stringBuilder.toString());
            // 拼接
            String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
            String userName = AuthUtil.getUser().getUserName();
            String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
            StringBuilder builder = new StringBuilder();
            builder.append(time)
                .append(",")
                .append(fillName)
                .append(",")
                .append(userName)
                .append(",")
                .append(phone)
                .append(";");
            // 判断是否存在
            if (null==newTbAttResRsbSpillway.getGuid() || newTbAttResRsbSpillway.getGuid().equals("")){
                // 填报
                newTbAttResRsbSpillway.setCheckLog(builder.toString());
            } else {
                for (TbAttResRsbSpillway tbAttResRsbSpillway : oldList) {
                    if (tbAttResRsbSpillway.getGuid().equals(newTbAttResRsbSpillway.getGuid())){
                        StringBuilder stringBuilder = new StringBuilder(null == tbAttResRsbSpillway.getCheckLog() ? "" : tbAttResRsbSpillway.getCheckLog());
                        stringBuilder.append(builder);
                        // 填报
                        newTbAttResRsbSpillway.setCheckLog(stringBuilder.toString());
                    }
                }
            }
        }
    }

    /**
     * @param oldAbAttResBase
     * @param newTbAttResRsbSpillway
     * @param oldList
     * @param newList
     * 更新操作记录
     */
    private void setUpdateLog(TbAttResRsbSpillway oldAbAttResBase,TbAttResRsbSpillway newTbAttResRsbSpillway) {
        String fillName = "";
        if (newTbAttResRsbSpillway.getCheckState()==0){
            fillName = "编辑";
        }
        if (newTbAttResRsbSpillway.getCheckState()==1){
            fillName = "提交";
        }
        if (newTbAttResRsbSpillway.getCheckState()==2){
            fillName = "审核";
        }
        if (newTbAttResRsbSpillway.getCheckState()==3){
            fillName = "退回" + (null==newTbAttResRsbSpillway.getCheckLog()?"":":" + newTbAttResRsbSpillway.getCheckLog());
        }
        // 管理员编辑
        if (newTbAttResRsbSpillway.getCheckState()==4){
            fillName = "编辑";
            newTbAttResRsbSpillway.setCheckState(oldAbAttResBase.getCheckState());
        }
    private void setUpdateLog(List<TbAttResRsbSpillway> oldList,List<TbAttResRsbSpillway> newList) {
        // 遍历
        for (TbAttResRsbSpillway newTbAttResRsbSpillway : newList){
            String fillName = "";
            if (newTbAttResRsbSpillway.getCheckState()==0){
                fillName = "编辑";
            }
            if (newTbAttResRsbSpillway.getCheckState()==1){
                fillName = "提交";
            }
            if (newTbAttResRsbSpillway.getCheckState()==2){
                fillName = "审核";
            }
            if (newTbAttResRsbSpillway.getCheckState()==3){
                fillName = "退回" + (null==newTbAttResRsbSpillway.getCheckLog()?"":":" + newTbAttResRsbSpillway.getCheckLog());
            }
            // 管理员编辑
            if (newTbAttResRsbSpillway.getCheckState()==4){
                fillName = "编辑";
                // 找到相关的 guid 数据
                for (TbAttResRsbSpillway tbAttResRsbSpillway : oldList) {
                    if (tbAttResRsbSpillway.getGuid().equals(newTbAttResRsbSpillway.getGuid())){
                        newTbAttResRsbSpillway.setCheckState(tbAttResRsbSpillway.getCheckState());
                    }
                }
            }

        // 拼接
        String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
        String userName = AuthUtil.getUser().getUserName();
        String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
        StringBuilder builder = new StringBuilder();
        builder.append(time)
            .append(",")
            .append(fillName)
            .append(",")
            .append(userName)
            .append(",")
            .append(phone)
            .append(";");
        // 判断是否存在
        if (null==oldAbAttResBase){
            // 填报
            newTbAttResRsbSpillway.setLog(builder.toString());
        }else {
            StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getLog()?"":oldAbAttResBase.getLog());
            stringBuilder.append(builder);
            // 填报
            newTbAttResRsbSpillway.setLog(stringBuilder.toString());
            // 拼接
            String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
            String userName = AuthUtil.getUser().getUserName();
            String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
            StringBuilder builder = new StringBuilder();
            builder.append(time)
                .append(",")
                .append(fillName)
                .append(",")
                .append(userName)
                .append(",")
                .append(phone)
                .append(";");
            // 判断是否存在
            if (null==newTbAttResRsbSpillway.getGuid() || newTbAttResRsbSpillway.getGuid().equals("")){
                // 填报
                newTbAttResRsbSpillway.setLog(builder.toString());
            }else {
                for (TbAttResRsbSpillway tbAttResRsbSpillway : oldList) {
                    if (tbAttResRsbSpillway.getGuid().equals(newTbAttResRsbSpillway.getGuid())){
                        StringBuilder stringBuilder = new StringBuilder(null==tbAttResRsbSpillway.getLog()?"":tbAttResRsbSpillway.getLog());
                        stringBuilder.append(builder);
                        // 填报
                        newTbAttResRsbSpillway.setLog(stringBuilder.toString());
                    }
                }
            }
        }
    }
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbVerspiServiceImpl.java

@@ -1,6 +1,7 @@
package cn.gistack.sm.sjztmd.service.impl;

import cn.gistack.sm.sjztmd.entity.TbAttResRsbVerspi;
import cn.gistack.sm.sjztmd.entity.TbAttResRsbVerspi;
import cn.gistack.sm.sjztmd.mapper.TbAttResRsbVerspiMapper;
import cn.gistack.sm.sjztmd.service.ITbAttResRsbVerspiService;
import cn.gistack.system.user.feign.IUserClient;
@@ -9,9 +10,12 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

/**
 * @ClassName TbAttResRsbVerspiServiceImpl
@@ -33,162 +37,197 @@
     * @return
     */
    @Override
    public TbAttResRsbVerspi getDetailByGuid(String guid) {
    public List<TbAttResRsbVerspi> getDetailByGuid(String guid) {
        return baseMapper.getDetailByResGuid(guid);
    }

    /**
     * 编辑
     * @param tbAttResRsbVerspi
     * @param newList
     * @return
     */
    @Override
    public boolean updateByGuid(TbAttResRsbVerspi tbAttResRsbVerspi) {
    public boolean updateByGuid(List<TbAttResRsbVerspi> newList) {
        // 查询是否存在
        TbAttResRsbVerspi detail = baseMapper.getDetailByResGuid(tbAttResRsbVerspi.getResGuid());
        List<TbAttResRsbVerspi> oldList = baseMapper.getDetailByResGuid(newList.get(0).getResGuid());
        // 更新日志
        setUpdateLog(detail,tbAttResRsbVerspi);
        // 修改
        int i = addOrUpdateByGuid(detail,tbAttResRsbVerspi);
        if (i>0){
        setUpdateLog(oldList,newList);
        // 创建或更新数据
        boolean flag = addOrUpdate(oldList,newList);
        // 返回
        return flag;
    }

    /**
     * 新增或更新数据
     * @param oldList
     * @param newList
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public boolean addOrUpdate(List<TbAttResRsbVerspi> oldList,List<TbAttResRsbVerspi> newList) {
        // 取旧数据和新提交数据差集--删除
        // 去除前一天已填报的人员手机号集合
        List<TbAttResRsbVerspi> removeList = oldList.stream().filter(vo -> !newList.stream().map(e ->
            e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
        // 取旧数据和新提交数据交集--更新
        List<TbAttResRsbVerspi> updateList = newList.stream().filter(vo -> oldList.stream().map(e ->
            e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
        // 取新数提交据和旧数据交集--新增
        List<TbAttResRsbVerspi> addList = newList.stream().filter(vo -> !oldList.stream().map(e ->
            e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
        boolean addFlag = true;
        boolean updateFlag = true;
        boolean removeFlag = true;
        if (addList.size()>0){
            // 批量新增
            addFlag = saveBatch(addList);
        }
        if (updateList.size()>0){
            // 批量更新
            addFlag = updateBatchById(updateList);
        }
        if (removeList.size()>0){
            // 批量删除
            removeFlag = removeBatchByIds(removeList);
        }
        if (addFlag && updateFlag && removeFlag){
            return true;
        }
        // 返回
        return false;
    }

    /**
     * 审核
     * @param tbAttResRsbVerspi
     * @param newList
     * @return
     */
    @Override
    public boolean auditByGuid(TbAttResRsbVerspi tbAttResRsbVerspi) {
    public boolean auditByGuid(List<TbAttResRsbVerspi> newList) {
        // 查询是否存在
        TbAttResRsbVerspi detail = baseMapper.getDetailByResGuid(tbAttResRsbVerspi.getResGuid());
        List<TbAttResRsbVerspi> oldList = baseMapper.getDetailByResGuid(newList.get(0).getResGuid());
        // 更新操作日志
        setUpdateLog(detail,tbAttResRsbVerspi);
        setUpdateLog(oldList,newList);
        // 更新审核日志
        setUpdateCheckLog(detail,tbAttResRsbVerspi);
        if (null!=detail){
            tbAttResRsbVerspi.setGuid(detail.getGuid());
        }
        // 驳回情况下将状态修改回0即已填写未提交状态
        if (tbAttResRsbVerspi.getCheckState()==3){
            tbAttResRsbVerspi.setCheckState(0);
        }
        setUpdateCheckLog(oldList,newList);
        // 更新数据
        int i = baseMapper.updateById(tbAttResRsbVerspi);
        if (i>0){
            return true;
        }
        return false;
    }

    /**
     * 更新
     * @param tbAttResRsbVerspi
     * @return
     */
    private int addOrUpdateByGuid(TbAttResRsbVerspi oldAbAttResBase,TbAttResRsbVerspi tbAttResRsbVerspi){
        int i = 0;
        if (null!=oldAbAttResBase){
            tbAttResRsbVerspi.setGuid(oldAbAttResBase.getGuid());
            // 更新
            i = baseMapper.updateById(tbAttResRsbVerspi);
        }else {
            tbAttResRsbVerspi.setCreateTime(new Date());
            i = baseMapper.insert(tbAttResRsbVerspi);
        }
        boolean batch = updateBatchById(newList);
        // 返回
        return i;
        return batch;
    }

    /**
     * @param oldAbAttResBase
     * @param newTbAttResRsbVerspi
     * @param oldList
     * @param newList
     * 更新审核记录
     */
    private void setUpdateCheckLog(TbAttResRsbVerspi oldAbAttResBase,TbAttResRsbVerspi newTbAttResRsbVerspi) {
        String fillName = "";
        if (newTbAttResRsbVerspi.getCheckState()==2){
            fillName = "审核";
        }
        if (newTbAttResRsbVerspi.getCheckState()==3){
            fillName = "退回" + (null==newTbAttResRsbVerspi.getCheckLog()?"":":" + newTbAttResRsbVerspi.getCheckLog());
        }
    private void setUpdateCheckLog(List<TbAttResRsbVerspi> oldList,List<TbAttResRsbVerspi> newList) {
        // 遍历
        for (TbAttResRsbVerspi newTbAttResRsbVerspi : newList) {
            String fillName = "";
            if (newTbAttResRsbVerspi.getCheckState() == 2) {
                fillName = "审核";
            }
            if (newTbAttResRsbVerspi.getCheckState() == 3) {
                fillName = "退回" + (null == newTbAttResRsbVerspi.getCheckLog() ? "" : ":" + newTbAttResRsbVerspi.getCheckLog());
                for (TbAttResRsbVerspi tbAttResRsbVerspi : oldList) {
                    if (tbAttResRsbVerspi.getGuid().equals(newTbAttResRsbVerspi.getGuid())){
                        // 退回时进行设置状态为填写中
                        newTbAttResRsbVerspi.setCheckState(0);
                    }
                }
            }

        // 拼接
        String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
        String userName = AuthUtil.getUser().getUserName();
        String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
        StringBuilder builder = new StringBuilder();
        builder.append(time)
            .append(",")
            .append(fillName)
            .append(",")
            .append(userName)
            .append(",")
            .append(phone)
            .append(";");
        // 判断是否存在
        if (null==oldAbAttResBase){
            // 填报
            newTbAttResRsbVerspi.setCheckLog(builder.toString());
        }else {
            StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getCheckLog()?"":oldAbAttResBase.getCheckLog());
            stringBuilder.append(builder);
            // 填报
            newTbAttResRsbVerspi.setCheckLog(stringBuilder.toString());
            // 拼接
            String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
            String userName = AuthUtil.getUser().getUserName();
            String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
            StringBuilder builder = new StringBuilder();
            builder.append(time)
                .append(",")
                .append(fillName)
                .append(",")
                .append(userName)
                .append(",")
                .append(phone)
                .append(";");
            // 判断是否存在
            if (null==newTbAttResRsbVerspi.getGuid() || newTbAttResRsbVerspi.getGuid().equals("")){
                // 填报
                newTbAttResRsbVerspi.setCheckLog(builder.toString());
            } else {
                for (TbAttResRsbVerspi tbAttResRsbVerspi : oldList) {
                    if (tbAttResRsbVerspi.getGuid().equals(newTbAttResRsbVerspi.getGuid())){
                        StringBuilder stringBuilder = new StringBuilder(null == tbAttResRsbVerspi.getCheckLog() ? "" : tbAttResRsbVerspi.getCheckLog());
                        stringBuilder.append(builder);
                        // 填报
                        newTbAttResRsbVerspi.setCheckLog(stringBuilder.toString());
                    }
                }
            }
        }
    }

    /**
     * @param oldAbAttResBase
     * @param newTbAttResRsbVerspi
     * @param oldList
     * @param newList
     * 更新操作记录
     */
    private void setUpdateLog(TbAttResRsbVerspi oldAbAttResBase,TbAttResRsbVerspi newTbAttResRsbVerspi) {
        String fillName = "";
        if (newTbAttResRsbVerspi.getCheckState()==0){
            fillName = "编辑";
        }
        if (newTbAttResRsbVerspi.getCheckState()==1){
            fillName = "提交";
        }
        if (newTbAttResRsbVerspi.getCheckState()==2){
            fillName = "审核";
        }
        if (newTbAttResRsbVerspi.getCheckState()==3){
            fillName = "退回" + (null==newTbAttResRsbVerspi.getCheckLog()?"":":" + newTbAttResRsbVerspi.getCheckLog());
        }
        // 管理员编辑
        if (newTbAttResRsbVerspi.getCheckState()==4){
            fillName = "编辑";
            newTbAttResRsbVerspi.setCheckState(oldAbAttResBase.getCheckState());
        }
    private void setUpdateLog(List<TbAttResRsbVerspi> oldList,List<TbAttResRsbVerspi> newList) {
        // 遍历
        for (TbAttResRsbVerspi newTbAttResRsbVerspi : newList){
            String fillName = "";
            if (newTbAttResRsbVerspi.getCheckState()==0){
                fillName = "编辑";
            }
            if (newTbAttResRsbVerspi.getCheckState()==1){
                fillName = "提交";
            }
            if (newTbAttResRsbVerspi.getCheckState()==2){
                fillName = "审核";
            }
            if (newTbAttResRsbVerspi.getCheckState()==3){
                fillName = "退回" + (null==newTbAttResRsbVerspi.getCheckLog()?"":":" + newTbAttResRsbVerspi.getCheckLog());
            }
            // 管理员编辑
            if (newTbAttResRsbVerspi.getCheckState()==4){
                fillName = "编辑";
                // 找到相关的 guid 数据
                for (TbAttResRsbVerspi tbAttResRsbVerspi : oldList) {
                    if (tbAttResRsbVerspi.getGuid().equals(newTbAttResRsbVerspi.getGuid())){
                        newTbAttResRsbVerspi.setCheckState(tbAttResRsbVerspi.getCheckState());
                    }
                }
            }

        // 拼接
        String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
        String userName = AuthUtil.getUser().getUserName();
        String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
        StringBuilder builder = new StringBuilder();
        builder.append(time)
            .append(",")
            .append(fillName)
            .append(",")
            .append(userName)
            .append(",")
            .append(phone)
            .append(";");
        // 判断是否存在
        if (null==oldAbAttResBase){
            // 填报
            newTbAttResRsbVerspi.setLog(builder.toString());
        }else {
            StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getLog()?"":oldAbAttResBase.getLog());
            stringBuilder.append(builder);
            // 填报
            newTbAttResRsbVerspi.setLog(stringBuilder.toString());
            // 拼接
            String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
            String userName = AuthUtil.getUser().getUserName();
            String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
            StringBuilder builder = new StringBuilder();
            builder.append(time)
                .append(",")
                .append(fillName)
                .append(",")
                .append(userName)
                .append(",")
                .append(phone)
                .append(";");
            // 判断是否存在
            if (null==newTbAttResRsbVerspi.getGuid() || newTbAttResRsbVerspi.getGuid().equals("")){
                // 填报
                newTbAttResRsbVerspi.setLog(builder.toString());
            }else {
                for (TbAttResRsbVerspi tbAttResRsbVerspi : oldList) {
                    if (tbAttResRsbVerspi.getGuid().equals(newTbAttResRsbVerspi.getGuid())){
                        StringBuilder stringBuilder = new StringBuilder(null==tbAttResRsbVerspi.getLog()?"":tbAttResRsbVerspi.getLog());
                        stringBuilder.append(builder);
                        // 填报
                        newTbAttResRsbVerspi.setLog(stringBuilder.toString());
                    }
                }
            }
        }
    }
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterBlockServiceImpl.java

@@ -1,6 +1,7 @@
package cn.gistack.sm.sjztmd.service.impl;

import cn.gistack.sm.sjztmd.entity.TbAttResWaterBlock;
import cn.gistack.sm.sjztmd.entity.TbAttResWaterBlock;
import cn.gistack.sm.sjztmd.mapper.TbAttResWaterBlockMapper;
import cn.gistack.sm.sjztmd.service.ITbAttResWaterBlockService;
import cn.gistack.system.user.feign.IUserClient;
@@ -9,9 +10,12 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

/**
 * @ClassName TbAttResWaterBlockServiceImpl
@@ -33,161 +37,197 @@
     * @return
     */
    @Override
    public TbAttResWaterBlock getDetailByGuid(String guid) {
    public List<TbAttResWaterBlock> getDetailByGuid(String guid) {
        return baseMapper.getDetailByResGuid(guid);
    }

    /**
     * 编辑
     * @param tbAttResWaterBlock
     * @param newList
     * @return
     */
    @Override
    public boolean updateByGuid(TbAttResWaterBlock tbAttResWaterBlock) {
    public boolean updateByGuid(List<TbAttResWaterBlock> newList) {
        // 查询是否存在
        TbAttResWaterBlock detail = baseMapper.getDetailByResGuid(tbAttResWaterBlock.getResGuid());
        List<TbAttResWaterBlock> oldList = baseMapper.getDetailByResGuid(newList.get(0).getResGuid());
        // 更新日志
        setUpdateLog(detail,tbAttResWaterBlock);
        // 修改
        int i = addOrUpdateByGuid(detail,tbAttResWaterBlock);
        if (i>0){
        setUpdateLog(oldList,newList);
        // 创建或更新数据
        boolean flag = addOrUpdate(oldList,newList);
        // 返回
        return flag;
    }

    /**
     * 新增或更新数据
     * @param oldList
     * @param newList
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public boolean addOrUpdate(List<TbAttResWaterBlock> oldList,List<TbAttResWaterBlock> newList) {
        // 取旧数据和新提交数据差集--删除
        // 去除前一天已填报的人员手机号集合
        List<TbAttResWaterBlock> removeList = oldList.stream().filter(vo -> !newList.stream().map(e ->
            e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
        // 取旧数据和新提交数据交集--更新
        List<TbAttResWaterBlock> updateList = newList.stream().filter(vo -> oldList.stream().map(e ->
            e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
        // 取新数提交据和旧数据交集--新增
        List<TbAttResWaterBlock> addList = newList.stream().filter(vo -> !oldList.stream().map(e ->
            e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
        boolean addFlag = true;
        boolean updateFlag = true;
        boolean removeFlag = true;
        if (addList.size()>0){
            // 批量新增
            addFlag = saveBatch(addList);
        }
        if (updateList.size()>0){
            // 批量更新
            addFlag = updateBatchById(updateList);
        }
        if (removeList.size()>0){
            // 批量删除
            removeFlag = removeBatchByIds(removeList);
        }
        if (addFlag && updateFlag && removeFlag){
            return true;
        }
        // 返回
        return false;
    }

    /**
     * 审核
     * @param tbAttResWaterBlock
     * @param newList
     * @return
     */
    @Override
    public boolean auditByGuid(TbAttResWaterBlock tbAttResWaterBlock) {
    public boolean auditByGuid(List<TbAttResWaterBlock> newList) {
        // 查询是否存在
        TbAttResWaterBlock detail = baseMapper.getDetailByResGuid(tbAttResWaterBlock.getResGuid());
        List<TbAttResWaterBlock> oldList = baseMapper.getDetailByResGuid(newList.get(0).getResGuid());
        // 更新操作日志
        setUpdateLog(detail,tbAttResWaterBlock);
        setUpdateLog(oldList,newList);
        // 更新审核日志
        setUpdateCheckLog(detail,tbAttResWaterBlock);
        if (null!=detail){
            tbAttResWaterBlock.setGuid(detail.getGuid());
        }
        // 驳回情况下将状态修改回0即已填写未提交状态
        if (tbAttResWaterBlock.getCheckState()==3){
            tbAttResWaterBlock.setCheckState(0);
        }
        setUpdateCheckLog(oldList,newList);
        // 更新数据
        int i = baseMapper.updateById(tbAttResWaterBlock);
        if (i>0){
            return true;
        }
        return false;
    }

    /**
     * 更新
     * @param tbAttResWaterBlock
     * @return
     */
    private int addOrUpdateByGuid(TbAttResWaterBlock oldAbAttResBase,TbAttResWaterBlock tbAttResWaterBlock){
        int i = 0;
        if (null!=oldAbAttResBase){
            tbAttResWaterBlock.setGuid(oldAbAttResBase.getGuid());
            // 更新
            i = baseMapper.updateById(tbAttResWaterBlock);
        }else {
            tbAttResWaterBlock.setCreateTime(new Date());
            i = baseMapper.insert(tbAttResWaterBlock);
        }
        boolean batch = updateBatchById(newList);
        // 返回
        return i;
        return batch;
    }

    /**
     * @param oldAbAttResBase
     * @param newTbAttResWaterBlock
     * @param oldList
     * @param newList
     * 更新审核记录
     */
    private void setUpdateCheckLog(TbAttResWaterBlock oldAbAttResBase,TbAttResWaterBlock newTbAttResWaterBlock) {
        String fillName = "";
        if (newTbAttResWaterBlock.getCheckState()==2){
            fillName = "审核";
        }
        if (newTbAttResWaterBlock.getCheckState()==3){
            fillName = "退回" + (null==newTbAttResWaterBlock.getCheckLog()?"":":" + newTbAttResWaterBlock.getCheckLog());
        }
    private void setUpdateCheckLog(List<TbAttResWaterBlock> oldList,List<TbAttResWaterBlock> newList) {
        // 遍历
        for (TbAttResWaterBlock newTbAttResWaterBlock : newList) {
            String fillName = "";
            if (newTbAttResWaterBlock.getCheckState() == 2) {
                fillName = "审核";
            }
            if (newTbAttResWaterBlock.getCheckState() == 3) {
                fillName = "退回" + (null == newTbAttResWaterBlock.getCheckLog() ? "" : ":" + newTbAttResWaterBlock.getCheckLog());
                for (TbAttResWaterBlock tbAttResWaterBlock : oldList) {
                    if (tbAttResWaterBlock.getGuid().equals(newTbAttResWaterBlock.getGuid())){
                        // 退回时进行设置状态为填写中
                        newTbAttResWaterBlock.setCheckState(0);
                    }
                }
            }

        // 拼接
        String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
        String userName = AuthUtil.getUser().getUserName();
        String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
        StringBuilder builder = new StringBuilder();
        builder.append(time)
            .append(",")
            .append(fillName)
            .append(",")
            .append(userName)
            .append(",")
            .append(phone)
            .append(";");
        // 判断是否存在
        if (null==oldAbAttResBase){
            // 填报
            newTbAttResWaterBlock.setCheckLog(builder.toString());
        }else {
            StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getCheckLog()?"":oldAbAttResBase.getCheckLog());
            stringBuilder.append(builder);
            // 填报
            newTbAttResWaterBlock.setCheckLog(stringBuilder.toString());
            // 拼接
            String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
            String userName = AuthUtil.getUser().getUserName();
            String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
            StringBuilder builder = new StringBuilder();
            builder.append(time)
                .append(",")
                .append(fillName)
                .append(",")
                .append(userName)
                .append(",")
                .append(phone)
                .append(";");
            // 判断是否存在
            if (null==newTbAttResWaterBlock.getGuid() || newTbAttResWaterBlock.getGuid().equals("")){
                // 填报
                newTbAttResWaterBlock.setCheckLog(builder.toString());
            } else {
                for (TbAttResWaterBlock tbAttResWaterBlock : oldList) {
                    if (tbAttResWaterBlock.getGuid().equals(newTbAttResWaterBlock.getGuid())){
                        StringBuilder stringBuilder = new StringBuilder(null == tbAttResWaterBlock.getCheckLog() ? "" : tbAttResWaterBlock.getCheckLog());
                        stringBuilder.append(builder);
                        // 填报
                        newTbAttResWaterBlock.setCheckLog(stringBuilder.toString());
                    }
                }
            }
        }
    }

    /**
     * @param oldAbAttResBase
     * @param newTbAttResWaterBlock
     * @param oldList
     * @param newList
     * 更新操作记录
     */
    private void setUpdateLog(TbAttResWaterBlock oldAbAttResBase,TbAttResWaterBlock newTbAttResWaterBlock) {
        String fillName = "";
        if (newTbAttResWaterBlock.getCheckState()==0){
            fillName = "编辑";
        }
        if (newTbAttResWaterBlock.getCheckState()==1){
            fillName = "提交";
        }
        if (newTbAttResWaterBlock.getCheckState()==2){
            fillName = "审核";
        }
        if (newTbAttResWaterBlock.getCheckState()==3){
            fillName = "退回" + (null==newTbAttResWaterBlock.getCheckLog()?"":":" + newTbAttResWaterBlock.getCheckLog());
        }
        if (newTbAttResWaterBlock.getCheckState()==4){
            fillName = "编辑";
            newTbAttResWaterBlock.setCheckState(oldAbAttResBase.getCheckState());
        }
    private void setUpdateLog(List<TbAttResWaterBlock> oldList,List<TbAttResWaterBlock> newList) {
        // 遍历
        for (TbAttResWaterBlock newTbAttResWaterBlock : newList){
            String fillName = "";
            if (newTbAttResWaterBlock.getCheckState()==0){
                fillName = "编辑";
            }
            if (newTbAttResWaterBlock.getCheckState()==1){
                fillName = "提交";
            }
            if (newTbAttResWaterBlock.getCheckState()==2){
                fillName = "审核";
            }
            if (newTbAttResWaterBlock.getCheckState()==3){
                fillName = "退回" + (null==newTbAttResWaterBlock.getCheckLog()?"":":" + newTbAttResWaterBlock.getCheckLog());
            }
            // 管理员编辑
            if (newTbAttResWaterBlock.getCheckState()==4){
                fillName = "编辑";
                // 找到相关的 guid 数据
                for (TbAttResWaterBlock tbAttResWaterBlock : oldList) {
                    if (tbAttResWaterBlock.getGuid().equals(newTbAttResWaterBlock.getGuid())){
                        newTbAttResWaterBlock.setCheckState(tbAttResWaterBlock.getCheckState());
                    }
                }
            }

        // 拼接
        String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
        String userName = AuthUtil.getUser().getUserName();
        String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
        StringBuilder builder = new StringBuilder();
        builder.append(time)
            .append(",")
            .append(fillName)
            .append(",")
            .append(userName)
            .append(",")
            .append(phone)
            .append(";");
        // 判断是否存在
        if (null==oldAbAttResBase){
            // 填报
            newTbAttResWaterBlock.setLog(builder.toString());
        }else {
            StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getLog()?"":oldAbAttResBase.getLog());
            stringBuilder.append(builder);
            // 填报
            newTbAttResWaterBlock.setLog(stringBuilder.toString());
            // 拼接
            String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
            String userName = AuthUtil.getUser().getUserName();
            String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
            StringBuilder builder = new StringBuilder();
            builder.append(time)
                .append(",")
                .append(fillName)
                .append(",")
                .append(userName)
                .append(",")
                .append(phone)
                .append(";");
            // 判断是否存在
            if (null==newTbAttResWaterBlock.getGuid() || newTbAttResWaterBlock.getGuid().equals("")){
                // 填报
                newTbAttResWaterBlock.setLog(builder.toString());
            }else {
                for (TbAttResWaterBlock tbAttResWaterBlock : oldList) {
                    if (tbAttResWaterBlock.getGuid().equals(newTbAttResWaterBlock.getGuid())){
                        StringBuilder stringBuilder = new StringBuilder(null==tbAttResWaterBlock.getLog()?"":tbAttResWaterBlock.getLog());
                        stringBuilder.append(builder);
                        // 填报
                        newTbAttResWaterBlock.setLog(stringBuilder.toString());
                    }
                }
            }
        }
    }
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterDeliveryServiceImpl.java

@@ -1,6 +1,7 @@
package cn.gistack.sm.sjztmd.service.impl;

import cn.gistack.sm.sjztmd.entity.TbAttResWaterDelivery;
import cn.gistack.sm.sjztmd.entity.TbAttResWaterDelivery;
import cn.gistack.sm.sjztmd.mapper.TbAttResWaterDeliveryMapper;
import cn.gistack.sm.sjztmd.service.ITbAttResWaterDeliveryService;
import cn.gistack.system.user.feign.IUserClient;
@@ -9,9 +10,12 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

/**
 * @ClassName TbAttResWaterDeliveryServiceImpl
@@ -33,161 +37,197 @@
     * @return
     */
    @Override
    public TbAttResWaterDelivery getDetailByGuid(String guid) {
    public List<TbAttResWaterDelivery> getDetailByGuid(String guid) {
        return baseMapper.getDetailByResGuid(guid);
    }

    /**
     * 编辑
     * @param tbAttResWaterDelivery
     * @param newList
     * @return
     */
    @Override
    public boolean updateByGuid(TbAttResWaterDelivery tbAttResWaterDelivery) {
    public boolean updateByGuid(List<TbAttResWaterDelivery> newList) {
        // 查询是否存在
        TbAttResWaterDelivery detail = baseMapper.getDetailByResGuid(tbAttResWaterDelivery.getResGuid());
        List<TbAttResWaterDelivery> oldList = baseMapper.getDetailByResGuid(newList.get(0).getResGuid());
        // 更新日志
        setUpdateLog(detail,tbAttResWaterDelivery);
        // 修改
        int i = addOrUpdateByGuid(detail,tbAttResWaterDelivery);
        if (i>0){
        setUpdateLog(oldList,newList);
        // 创建或更新数据
        boolean flag = addOrUpdate(oldList,newList);
        // 返回
        return flag;
    }

    /**
     * 新增或更新数据
     * @param oldList
     * @param newList
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public boolean addOrUpdate(List<TbAttResWaterDelivery> oldList,List<TbAttResWaterDelivery> newList) {
        // 取旧数据和新提交数据差集--删除
        // 去除前一天已填报的人员手机号集合
        List<TbAttResWaterDelivery> removeList = oldList.stream().filter(vo -> !newList.stream().map(e ->
            e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
        // 取旧数据和新提交数据交集--更新
        List<TbAttResWaterDelivery> updateList = newList.stream().filter(vo -> oldList.stream().map(e ->
            e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
        // 取新数提交据和旧数据交集--新增
        List<TbAttResWaterDelivery> addList = newList.stream().filter(vo -> !oldList.stream().map(e ->
            e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
        boolean addFlag = true;
        boolean updateFlag = true;
        boolean removeFlag = true;
        if (addList.size()>0){
            // 批量新增
            addFlag = saveBatch(addList);
        }
        if (updateList.size()>0){
            // 批量更新
            addFlag = updateBatchById(updateList);
        }
        if (removeList.size()>0){
            // 批量删除
            removeFlag = removeBatchByIds(removeList);
        }
        if (addFlag && updateFlag && removeFlag){
            return true;
        }
        // 返回
        return false;
    }

    /**
     * 审核
     * @param tbAttResWaterDelivery
     * @param newList
     * @return
     */
    @Override
    public boolean auditByGuid(TbAttResWaterDelivery tbAttResWaterDelivery) {
    public boolean auditByGuid(List<TbAttResWaterDelivery> newList) {
        // 查询是否存在
        TbAttResWaterDelivery detail = baseMapper.getDetailByResGuid(tbAttResWaterDelivery.getResGuid());
        List<TbAttResWaterDelivery> oldList = baseMapper.getDetailByResGuid(newList.get(0).getResGuid());
        // 更新操作日志
        setUpdateLog(detail,tbAttResWaterDelivery);
        setUpdateLog(oldList,newList);
        // 更新审核日志
        setUpdateCheckLog(detail,tbAttResWaterDelivery);
        if (null!=detail){
            tbAttResWaterDelivery.setGuid(detail.getGuid());
        }
        // 驳回情况下将状态修改回0即已填写未提交状态
        if (tbAttResWaterDelivery.getCheckState()==3){
            tbAttResWaterDelivery.setCheckState(0);
        }
        setUpdateCheckLog(oldList,newList);
        // 更新数据
        int i = baseMapper.updateById(tbAttResWaterDelivery);
        if (i>0){
            return true;
        }
        return false;
    }

    /**
     * 更新
     * @param tbAttResWaterDelivery
     * @return
     */
    private int addOrUpdateByGuid(TbAttResWaterDelivery oldAbAttResBase,TbAttResWaterDelivery tbAttResWaterDelivery){
        int i = 0;
        if (null!=oldAbAttResBase){
            tbAttResWaterDelivery.setGuid(oldAbAttResBase.getGuid());
            // 更新
            i = baseMapper.updateById(tbAttResWaterDelivery);
        }else {
            tbAttResWaterDelivery.setCreateTime(new Date());
            i = baseMapper.insert(tbAttResWaterDelivery);
        }
        boolean batch = updateBatchById(newList);
        // 返回
        return i;
        return batch;
    }

    /**
     * @param oldAbAttResBase
     * @param newTbAttResWaterDelivery
     * @param oldList
     * @param newList
     * 更新审核记录
     */
    private void setUpdateCheckLog(TbAttResWaterDelivery oldAbAttResBase,TbAttResWaterDelivery newTbAttResWaterDelivery) {
        String fillName = "";
        if (newTbAttResWaterDelivery.getCheckState()==2){
            fillName = "审核";
        }
        if (newTbAttResWaterDelivery.getCheckState()==3){
            fillName = "退回" + (null==newTbAttResWaterDelivery.getCheckLog()?"":":" + newTbAttResWaterDelivery.getCheckLog());
        }
    private void setUpdateCheckLog(List<TbAttResWaterDelivery> oldList,List<TbAttResWaterDelivery> newList) {
        // 遍历
        for (TbAttResWaterDelivery newTbAttResWaterDelivery : newList) {
            String fillName = "";
            if (newTbAttResWaterDelivery.getCheckState() == 2) {
                fillName = "审核";
            }
            if (newTbAttResWaterDelivery.getCheckState() == 3) {
                fillName = "退回" + (null == newTbAttResWaterDelivery.getCheckLog() ? "" : ":" + newTbAttResWaterDelivery.getCheckLog());
                for (TbAttResWaterDelivery tbAttResWaterDelivery : oldList) {
                    if (tbAttResWaterDelivery.getGuid().equals(newTbAttResWaterDelivery.getGuid())){
                        // 退回时进行设置状态为填写中
                        newTbAttResWaterDelivery.setCheckState(0);
                    }
                }
            }

        // 拼接
        String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
        String userName = AuthUtil.getUser().getUserName();
        String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
        StringBuilder builder = new StringBuilder();
        builder.append(time)
            .append(",")
            .append(fillName)
            .append(",")
            .append(userName)
            .append(",")
            .append(phone)
            .append(";");
        // 判断是否存在
        if (null==oldAbAttResBase){
            // 填报
            newTbAttResWaterDelivery.setCheckLog(builder.toString());
        }else {
            StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getCheckLog()?"":oldAbAttResBase.getCheckLog());
            stringBuilder.append(builder);
            // 填报
            newTbAttResWaterDelivery.setCheckLog(stringBuilder.toString());
            // 拼接
            String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
            String userName = AuthUtil.getUser().getUserName();
            String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
            StringBuilder builder = new StringBuilder();
            builder.append(time)
                .append(",")
                .append(fillName)
                .append(",")
                .append(userName)
                .append(",")
                .append(phone)
                .append(";");
            // 判断是否存在
            if (null==newTbAttResWaterDelivery.getGuid() || newTbAttResWaterDelivery.getGuid().equals("")){
                // 填报
                newTbAttResWaterDelivery.setCheckLog(builder.toString());
            } else {
                for (TbAttResWaterDelivery tbAttResWaterDelivery : oldList) {
                    if (tbAttResWaterDelivery.getGuid().equals(newTbAttResWaterDelivery.getGuid())){
                        StringBuilder stringBuilder = new StringBuilder(null == tbAttResWaterDelivery.getCheckLog() ? "" : tbAttResWaterDelivery.getCheckLog());
                        stringBuilder.append(builder);
                        // 填报
                        newTbAttResWaterDelivery.setCheckLog(stringBuilder.toString());
                    }
                }
            }
        }
    }

    /**
     * @param oldAbAttResBase
     * @param newTbAttResWaterDelivery
     * @param oldList
     * @param newList
     * 更新操作记录
     */
    private void setUpdateLog(TbAttResWaterDelivery oldAbAttResBase,TbAttResWaterDelivery newTbAttResWaterDelivery) {
        String fillName = "";
        if (newTbAttResWaterDelivery.getCheckState()==0){
            fillName = "编辑";
        }
        if (newTbAttResWaterDelivery.getCheckState()==1){
            fillName = "提交";
        }
        if (newTbAttResWaterDelivery.getCheckState()==2){
            fillName = "审核";
        }
        if (newTbAttResWaterDelivery.getCheckState()==3){
            fillName = "退回" + (null==newTbAttResWaterDelivery.getCheckLog()?"":":" + newTbAttResWaterDelivery.getCheckLog());
        }
        if (newTbAttResWaterDelivery.getCheckState()==4){
            fillName = "编辑";
            newTbAttResWaterDelivery.setCheckState(oldAbAttResBase.getCheckState());
        }
    private void setUpdateLog(List<TbAttResWaterDelivery> oldList,List<TbAttResWaterDelivery> newList) {
        // 遍历
        for (TbAttResWaterDelivery newTbAttResWaterDelivery : newList){
            String fillName = "";
            if (newTbAttResWaterDelivery.getCheckState()==0){
                fillName = "编辑";
            }
            if (newTbAttResWaterDelivery.getCheckState()==1){
                fillName = "提交";
            }
            if (newTbAttResWaterDelivery.getCheckState()==2){
                fillName = "审核";
            }
            if (newTbAttResWaterDelivery.getCheckState()==3){
                fillName = "退回" + (null==newTbAttResWaterDelivery.getCheckLog()?"":":" + newTbAttResWaterDelivery.getCheckLog());
            }
            // 管理员编辑
            if (newTbAttResWaterDelivery.getCheckState()==4){
                fillName = "编辑";
                // 找到相关的 guid 数据
                for (TbAttResWaterDelivery tbAttResWaterDelivery : oldList) {
                    if (tbAttResWaterDelivery.getGuid().equals(newTbAttResWaterDelivery.getGuid())){
                        newTbAttResWaterDelivery.setCheckState(tbAttResWaterDelivery.getCheckState());
                    }
                }
            }

        // 拼接
        String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
        String userName = AuthUtil.getUser().getUserName();
        String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
        StringBuilder builder = new StringBuilder();
        builder.append(time)
            .append(",")
            .append(fillName)
            .append(",")
            .append(userName)
            .append(",")
            .append(phone)
            .append(";");
        // 判断是否存在
        if (null==oldAbAttResBase){
            // 填报
            newTbAttResWaterDelivery.setLog(builder.toString());
        }else {
            StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getLog()?"":oldAbAttResBase.getLog());
            stringBuilder.append(builder);
            // 填报
            newTbAttResWaterDelivery.setLog(stringBuilder.toString());
            // 拼接
            String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
            String userName = AuthUtil.getUser().getUserName();
            String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
            StringBuilder builder = new StringBuilder();
            builder.append(time)
                .append(",")
                .append(fillName)
                .append(",")
                .append(userName)
                .append(",")
                .append(phone)
                .append(";");
            // 判断是否存在
            if (null==newTbAttResWaterDelivery.getGuid() || newTbAttResWaterDelivery.getGuid().equals("")){
                // 填报
                newTbAttResWaterDelivery.setLog(builder.toString());
            }else {
                for (TbAttResWaterDelivery tbAttResWaterDelivery : oldList) {
                    if (tbAttResWaterDelivery.getGuid().equals(newTbAttResWaterDelivery.getGuid())){
                        StringBuilder stringBuilder = new StringBuilder(null==tbAttResWaterDelivery.getLog()?"":tbAttResWaterDelivery.getLog());
                        stringBuilder.append(builder);
                        // 填报
                        newTbAttResWaterDelivery.setLog(stringBuilder.toString());
                    }
                }
            }
        }
    }
}