花城 修改我的项目列表没数据 资源共享新增单位名称字段

lidongdong

2024-07-04 8970e8985139b1266b1b2840c6ae65152272597d

花城 修改我的项目列表没数据  资源共享新增单位名称字段

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightResourceSharingDTO.java

@@ -20,6 +20,9 @@
    @ApiModelProperty("单位id")
    private String unitId;

    @ApiModelProperty("单位名称")
    private String unitName;

    @ApiModelProperty("项目id")
    private String meritId;


 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NewStriveApi.java

@@ -193,9 +193,10 @@
    public R getNeedTaskList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageNum") int pageSize,
                             @RequestParam(value = "unitId", required = false) String unitId,
                             @RequestParam(value = "kind", required = false) String kind)
                             @RequestParam(value = "kind", required = false) String kind,
                             @RequestParam(value = "status", required = false) String status)
    {
        return newStriveForFeign.getNeedTaskList(pageNum,pageSize,unitId,kind);
        return newStriveForFeign.getNeedTaskList(pageNum,pageSize,unitId,kind,status);
    }

    @ApiOperation(value = "代单位任务报名详情", response = NeedProblemUnitTaskDTO.class)

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

@@ -79,7 +79,13 @@
                return R.fail("参与人数已满");
            }
        }
        return R.ok(baseMapper.addData(item));

        int num=baseMapper.addData(item);
        if(num!=1)
        {
            return R.fail("报名失败");
        }
        return R.ok();
    }

    @Override

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComActProjectMapper.xml

@@ -34,7 +34,7 @@
                and speciality like concat ('%',#{item.speciality},'%')
            </if>
            <if test="item.project !=null and item.project !='' ">
                and speciality like concat ('%',#{item.project},'%')
                and project like concat ('%',#{item.project},'%')
            </if>
        </where>
        order by create_time desc

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightResourceSharingMapper.xml

@@ -17,8 +17,20 @@
    </sql>

    <select id="getList" resultType="com.panzhihua.common.model.dtos.partybuilding.NewFightResourceSharingDTO">
        SELECT <include refid="Base_Column_List"></include>
        FROM new_fight_resource_sharing
        SELECT
        nfrs.id,
        nfrs.title,
        nfrs.unit_id,
        nfrs.merit_id,
        nfrs.img_url,
        nfrs.phone,
        nfrs.linkman,
        nfrs.creation_time,
        cpcu.name as unitName,
        nfrs.update_time,
        nfrs.community_id
        FROM new_fight_resource_sharing as nfrs
        LEFT join com_pb_check_unit as cpcu on nfrs.unit_id=cpcu.id
        <where>
            1=1
            <if test="communityId !=null and communityId != '' ">