增加危害等级

aix

2024-06-27 b783839286ff650ed413b6edf17efa8491644737

增加危害等级

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

@@ -78,26 +78,26 @@
        return R.data(tbResGeneralInvestigationService.page(Condition.getPage(query), queryWrapper));
    }

    @ApiOperation(value = "白蚁普查-校核接口", notes = "白蚁普查-添加或者修改")
    @ApiOperation(value = "白蚁普查-校核接口", notes = "白蚁普查-校核接口")
    @PostMapping("/checkInfoByResGuid")
    public R checkInfoByResGuid(@RequestBody TbResGeneralInvestigation tbResGeneralInvestigation) {
    public R checkInfoByResGuid(@RequestBody TbResGeneralInvestigationState tbResGeneralInvestigationState) {

        if (tbResGeneralInvestigation.getTbStateId() == null || tbResGeneralInvestigation.getCheckState() == null) {
        if (tbResGeneralInvestigationState.getGuid() == null || tbResGeneralInvestigationState.getCheckState() == null) {
            return R.fail(-1,"参数不对");
        }

        //查询根据状态id查询普查记录表
        QueryWrapper queryWrapper = new QueryWrapper();
        queryWrapper.eq("\"tb_state_id\"", tbResGeneralInvestigation.getTbStateId());
        queryWrapper.eq("\"tb_state_id\"", tbResGeneralInvestigationState.getGuid());
        List<TbResGeneralInvestigation> list = tbResGeneralInvestigationService.list(queryWrapper);
        List<TbResGeneralInvestigation> editList = list.stream().map(categoryEntity -> {
                categoryEntity.setCheckState(tbResGeneralInvestigation.getCheckState());  // 给每个categoryEntity对象的EvaluateTaskId属性设置新值
                categoryEntity.setCheckState(tbResGeneralInvestigationState.getCheckState());  // 给每个categoryEntity对象的EvaluateTaskId属性设置新值
                return categoryEntity;  // 返回修改后的对象
            })
            .collect(Collectors.toList());
        TbResGeneralInvestigationState tbResGeneralInvestigationState = new TbResGeneralInvestigationState();
        tbResGeneralInvestigationState.setGuid(tbResGeneralInvestigation.getTbStateId());
        tbResGeneralInvestigationState.setCheckState(tbResGeneralInvestigation.getCheckState());
//        TbResGeneralInvestigationState tbResGeneralInvestigationState = new TbResGeneralInvestigationState();
//        tbResGeneralInvestigationState.setGuid(tbResGeneralInvestigation.getGuid());
//        tbResGeneralInvestigationState.setCheckState(tbResGeneralInvestigation.getCheckState());

        //更新普查记录表状态和状态表状态
        return R.status(tbResGeneralInvestigationService.updateBatchById(editList) && tbResGeneralInvestigationStateService.updateById(tbResGeneralInvestigationState));

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

@@ -130,9 +130,9 @@
    private String investigationWay;

    /**
     * 危害等级
     * 危害情况
     */
    @ApiModelProperty(value = "危害等级")
    @ApiModelProperty(value = "危害情况")
    @TableField(value = "\"hazard_rating\"", fill = FieldFill.UPDATE)
    private String hazardRating;


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

@@ -55,11 +55,18 @@
    @TableField(value = "\"res_guid\"")
    private String resGuid;

    /**
     * 危害等级
     */
    @ApiModelProperty(value = "危害等级")
    @TableField(value = "\"danger_level\"")
    private Integer dangerLevel;


    /**
     * 填报状态（0填报中，1待审核，2已审核）
     * 填报状态（0 填报中 1 已提交/待校核  2 已校核/待审核    3已审核）
     */
    @ApiModelProperty(value = "填报状态（0填报中，1待审核，2已审核")
    @ApiModelProperty(value = "0 填报中 1 已提交/待校核  2 已校核/待审核    3已审核")
    @TableField("\"check_state\"")
    @JsonSerialize(using = ToStringSerializer.class)
    private Integer checkState;
@@ -74,9 +81,9 @@
    private Date createTime;

    /**
     * 纬度
     * 创建用户
     */
    @ApiModelProperty(value = "纬度")
    @ApiModelProperty(value = "创建用户")
    @TableField(value = "\"create_user\"")
    private String createUser;


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

@@ -21,6 +21,7 @@
        b."guid" as tbStateId,
        b."tb_year",
        b."tb_quarter",
        b."danger_level" dangerLevel,
        (CASE WHEN tmp.totalDangerNum>0 THEN 1 ELSE 2 END) as hasDanger,
        tmp.totalDangerNum,
        tmp.termiteNum,

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

@@ -21,6 +21,8 @@

    private String tbQuarter;//填报季度

    private Integer dangerLevel;//危害等级

    //危害总普查长度
    private double totalLength;