bug修改

101captain

2022-06-01 1a21c37e2c41236c89e97a33e9da65c5fe7971b6

bug修改

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidRecordApi.java

@@ -126,8 +126,8 @@
    }
    @ApiOperation(value = "新版查看详情",response = ComActAcidRecordVO.class)
    @GetMapping("/detailByApp")
    public R detailByApp(@RequestParam("id")Long id){
        return this.communityService.detailByApp(id);
    public R detailByApp(@RequestParam("id")Long id,@RequestParam("localCity")String localCity){
        return this.communityService.detailByApp(id,localCity);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -9648,7 +9648,7 @@
     * @return 删除结果
     */
    @GetMapping("/comActAcidRecord/detailByApp")
    R detailByApp(@RequestParam("id") Long id);
    R detailByApp(@RequestParam("id") Long id,@RequestParam("localCity")String localCity);

    @GetMapping("/comActAcidRecord/charts")
    R charts(@RequestParam("date")String date,@RequestParam("localCity")String localCity);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidRecordApi.java

@@ -158,7 +158,7 @@
    }

    @GetMapping("/detailByApp")
    public R detailByApp(@RequestParam("id")Long id){
        return this.comActAcidRecordService.detailByApp(id);
    public R detailByApp(@RequestParam("id")Long id,@RequestParam("localCity")String localCity){
        return this.comActAcidRecordService.detailByApp(id,localCity);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActAcidRecordDao.java

@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActAcidRecord;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.List;

@@ -89,7 +90,7 @@
     * @param id
     * @return
     */
    ComActAcidRecordVO selectLastNext(Long id);
    ComActAcidRecordVO selectLastNext(@RequestParam("id") Long id,@RequestParam("localCity")String localCity);

    /**
     * 查询区级填报人数

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActAcidRecordService.java

@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
import com.panzhihua.service_community.entity.ComActAcidRecord;
import org.springframework.web.bind.annotation.RequestParam;

/**
 * (ComActAcidRecord)表服务接口
@@ -95,7 +96,7 @@
     * @param id
     * @return
     */
    R detailByApp(Long id);
    R detailByApp(Long id,String localCity);

    /**
     * 后台查看详情

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java

@@ -24,6 +24,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestParam;

import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -458,9 +459,9 @@
    }

    @Override
    public R detailByApp(Long id) {
    public R detailByApp(Long id,String localCity) {
        ComActAcidRecord comActAcidRecord=this.baseMapper.selectById(id);
        ComActAcidRecordVO comActAcidRecordVO=this.baseMapper.selectLastNext(id);
        ComActAcidRecordVO comActAcidRecordVO=this.baseMapper.selectLastNext(id,localCity);
        BeanUtils.copyProperties(comActAcidRecord,comActAcidRecordVO);
        return R.ok(comActAcidRecordVO);
    }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml

@@ -274,8 +274,10 @@
    </select>

    <select id="selectLastNext" resultType="com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO">
        select(select min(id) from com_act_acid_record where id > #{id} and check_status = 0)            next_id,
              (select max(id) as next_id from com_act_acid_record where #{id} > id and check_status = 0) last_id
        select(select min(id) from com_act_acid_record where id > #{id} and check_status = 0 <if test="localCity!=null and localCity!='' and localCity !='panzhihua'">and local_city like
        concat('%',#{localCity},'%')</if>)            next_id,
              (select max(id) as next_id from com_act_acid_record where #{id} > id and check_status = 0 <if test="localCity!=null and localCity!='' and localCity !='panzhihua'">and local_city like
        concat('%',#{localCity},'%')</if>) last_id
    </select>

    <select id="selectAcidCount" resultType="com.panzhihua.common.model.vos.community.acid.ComActAcidChartsVO">