Merge remote-tracking branch 'origin/partyBuilding_lyq' into partyBuilding_lyq

luoyuanqiao

2022-03-02 fe062f784d505381e49f8720d53577c4099908bd

Merge remote-tracking branch 'origin/partyBuilding_lyq' into partyBuilding_lyq

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

@@ -216,8 +216,9 @@
            "p.urban_status, " +
            "p.img_width, " +
            "p.img_height, " +
            "p.evaluate_date, " +
            "caepe.score," +
            "caepe.`content` " +
            "caepe.`content`, " +
            "p.handle_photo_list " +
            "FROM " +
            "com_act_easy_photo p " +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java

@@ -203,7 +203,7 @@
        int dsh = 1;
        int dfk = 2;
        int ybh = 3;
        int dpj = 4;
        int ywc = 5;
        int ywc = 4;
        int ypj = 5;
    }
}

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

@@ -141,7 +141,7 @@
        if(easyPhotoDO == null){
            return R.fail("未查询到该记录");
        }
        if(!easyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dpj)){
        if(!easyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.ywc)){
            return R.fail("当前状态不可进行评价");
        }
        Date nowDate = new Date();
@@ -149,7 +149,7 @@
        this.addEasyPhotoEvaluateRecord(easyPhotoDO.getCommunityId(),whistleDto.getUserId(),easyPhotoDO.getId(),whistleDto.getScore()
                ,whistleDto.getContent(),nowDate,ComActEasyPhotoEvaluate.ServiceType.SSP);
        //更新随手拍状态
        easyPhotoDO.setStatus(ComActEasyPhotoDO.status.ywc);
        easyPhotoDO.setStatus(ComActEasyPhotoDO.status.ypj);
        easyPhotoDO.setEvaluateDate(nowDate);
        easyPhotoDAO.updateById(easyPhotoDO);
        return R.ok();

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java

@@ -755,7 +755,7 @@
     * @param userId    用户id
     * @return  导入结果
     */
    @PostMapping("/partybuildIng/importPbMemberRole")
    @PostMapping("/importPbMemberRole")
    public R importPbMemberRole(@RequestBody List<ComPbMemberRoleExcelVo> memberRoleExcelVoList,@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId){
        return comPbMemberService.importPbMemberRole(memberRoleExcelVoList,communityId,userId);
    }