共享资源清单bug

luoxinwu

2023-12-18 3047f65c50f468aa23d57339b8f4485f47cd007f

共享资源清单bug

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/area/StreetAndBuildVO.java

New file
@@ -0,0 +1,28 @@
package com.panzhihua.common.model.vos.area;

import lombok.Data;

@Data
public class StreetAndBuildVO {


    /**
     * 社区名称
     */
    private String name;

    /**
     * 人口数量
     */
    private Integer peopleNum;

    /**
     * 小区数量
     */
    private Integer villageNum;

    /**
     * 房屋数量
     */
    private Integer buildNum;
}

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

New file
@@ -0,0 +1,14 @@
package com.panzhihua.service_community.api;

import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@Slf4j
@RestController
@RequestMapping("/largeScreen")
public class LargeScreenApi {


}

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

@@ -2,10 +2,8 @@

import java.util.List;

import com.panzhihua.common.model.vos.area.StreetAndBuildVO;
import com.panzhihua.common.model.vos.community.ComActPasswordVo;
import com.panzhihua.common.model.vos.community.DataCount;
import com.panzhihua.common.model.vos.partybuilding.ComPbMemberTypeVO;
import com.panzhihua.common.model.vos.puda.DynamicVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -178,4 +176,7 @@
     */
    @Select("SELECT count(1) FROM com_act_social_org")
    Integer countSocialOrg();


    List<StreetAndBuildVO> oneTagThreeReal();
}

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

New file
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.ComActDAO">


    <select id="oneTagThreeReal" resultType="com.panzhihua.common.model.vos.area.StreetAndBuildVO">
        select * from com_street cs left join com_act ca on cs.street_id = ca.street_id
                                    left join com_mng_village cmv on cmv.community_id = ca.community_id
                                    left join com_mng_building cmb on cmb.village_id = cmv.village_id
                                 <where>
                                     <if test="">
                                         and
                                     </if>
                                 </where>
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/ComActProject.java

@@ -2,6 +2,8 @@

import lombok.Data;

import java.util.Date;

@Data
public class ComActProject {

@@ -18,4 +20,6 @@
    private String phone;

    private String image;

    private Date createTime;
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java

@@ -1211,6 +1211,7 @@
        wrapper.eq(ComActProject::getUnitId,projectVO.getUnitId());
        wrapper.eq(projectVO.getSpeciality()!=null,ComActProject::getSpeciality,projectVO.getSpeciality());
        wrapper.eq(projectVO.getProject()!=null,ComActProject::getProject,projectVO.getProject());
        wrapper.orderByDesc(ComActProject::getCreateTime);
        List<ComActProject> comActProjects = comActProjectMapper.selectList(wrapper);
        return R.ok(comActProjects);
    }
@@ -1218,6 +1219,7 @@
    @Transactional(rollbackFor = Exception.class)
    @Override
    public R addProject(ProjectVO projectVO) {
        Date date = new Date();
        ComActProject comActProject = new ComActProject();
        comActProject.setUnitId(projectVO.getUnitId());
        comActProject.setUnitName(projectVO.getUnitName());
@@ -1225,6 +1227,7 @@
        comActProject.setProject(projectVO.getProject());
        comActProject.setPhone(projectVO.getPhone());
        comActProject.setImage(projectVO.getImage());
        comActProject.setCreateTime(date);
        comActProjectMapper.insert(comActProject);
      //  new_fight_resource_sharing
        NewFightResourceSharingDTO dto = new NewFightResourceSharingDTO();
@@ -1234,8 +1237,8 @@
        dto.setImgUrl(projectVO.getImage());
        dto.setPhone(projectVO.getPhone());
        dto.setCommunityId(projectVO.getCommunityId());
        dto.setCreationTime(new Date());
        newFightResourceSharingDAO.insert(dto);
        dto.setCreationTime(date);
        newFightResourceSharingDAO.addData(dto);
        return R.ok();
    }