应急sql修改,责任人返回字段增加

guoshilong

2023-06-12 158f13a8efad9382b79c58c8304a0636e0b91a04

应急sql修改,责任人返回字段增加

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/MaterialsManageMapper.xml

@@ -58,7 +58,7 @@
        <if test="vo.town !=null and vo.town !=''">
            AND MM.town = #{vo.town}
        </if>
        <if test="vo.resGuid !=null and resGuid !=''">
        <if test="vo.resGuid !=null and vo.resGuid !=''">
            AND MM.res_guid = #{vo.resGuid}
        </if>
        <if test="vo.year!=null and vo.year!=''">

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/RescueTeamManageMapper.xml

@@ -30,8 +30,8 @@
        <if test="vo.town !=null and vo.town !=''">
            AND RM.town = #{vo.town}
        </if>
        <if test="vo.resGuid !=null and resGuid !=''">
            AND MM.res_guid = #{vo.resGuid}
        <if test="vo.resGuid !=null and vo.resGuid !=''">
            AND RM.res_guid = #{vo.resGuid}
        </if>
        <if test="vo.year!=null and vo.year!=''">
            and date_format(RM.create_time,'%Y') = #{vo.year}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolReportController.java

@@ -15,6 +15,7 @@
import org.springframework.web.bind.annotation.*;

import java.util.Arrays;
import java.util.List;

/**
* @Description: 巡查上报
@@ -56,6 +57,15 @@
       return R.data(patrolReportService.updateById(patrolReport));
   }

    /**
     * 批量编辑
     */
    @ApiOperation(value="巡查上报-批量编辑", notes="巡查上报-批量编辑")
    @RequestMapping(value = "/editBatch", method = {RequestMethod.PUT,RequestMethod.POST})
   public R editBatch(@RequestBody List<PatrolReport> list){
       return R.data(patrolReportService.updateBatchById(list));
   }

   /**
    * 通过id删除
    *

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

@@ -72,6 +72,7 @@
                Map<Object, Object> map = new HashMap<>();
                map.put("value", userList.get(0).getId().toString());
                map.put("name", userList.get(0).getName());
                map.put("type",person.getType());
                resList.add(map);
            }
        }