花城 修改随手拍管理模块：第一次处理随手拍内容，提示：该随手拍已处理，不可重复操作。需修改为：该随手拍已处理。若是再次点击处理按钮才提示：该随手拍已...

lidongdong

2024-05-29 cbbd5469271a8486bd28db82ad3627434f6a1d17

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

@@ -129,6 +129,7 @@
        }
        return R.ok(iPage);
    }

    @Override
    public R pageMicroWishAppletsDesensitize(ComActMicroWishVO comActMicroWishVO) {
        Long userId = comActMicroWishVO.getResponsibleId();
@@ -318,14 +319,30 @@
                comActMicroWishDO.setDistributionAt(date);
                comActMicroWishDO.setResponsibleId(responsibleId);
                comActMicroWishDO.setStatus(3);//进行中
                comActMicroWishDO.setForm(1);
//                comActMicroWishDO.setForm(1);
                if(comActMicroWishVO.getHandleIds() != null && comActMicroWishVO.getHandleIds().size() > 0){
                    comActMicroWishDO.setHandleId(Joiner.on(",").join(comActMicroWishVO.getHandleIds()));
                }
                //添加操作记录
                comActMicroWishOperationRecordDO.setType(ComActMicroWishOperationRecordDO.type.fp);
                comActMicroWishOperationRecordDO.setContent("分配心愿");
                comActMicroWishOperationRecordDO.setRemark("分配心愿");
                if(comActMicroWishDO.getForm()!=null)
                {
                    if(comActMicroWishDO.getForm()==3)
                    {
                        comActMicroWishOperationRecordDO.setContent("认领心愿");
                        comActMicroWishOperationRecordDO.setRemark("认领心愿");
                    }
                    else
                    {
                        comActMicroWishOperationRecordDO.setContent("分配心愿");
                        comActMicroWishOperationRecordDO.setRemark("分配心愿");
                    }
                }
                else
                {
                    comActMicroWishOperationRecordDO.setContent("分配心愿");
                    comActMicroWishOperationRecordDO.setRemark("分配心愿");
                }
                comActMicroWishOperationRecordDO.setUserId(responsibleId);
                comActMicroWishOperationRecordMapper.insert(comActMicroWishOperationRecordDO);

@@ -381,7 +398,7 @@
                    //添加操作记录
                    comActMicroWishOperationRecordDO.setType(ComActMicroWishOperationRecordDO.type.fk);
                    comActMicroWishOperationRecordDO.setContent(feedback);
                    if(comActMicroWishVO.getForm()==3)
                    if(microWishDO.getForm()==3)
                    {
                        comActMicroWishOperationRecordDO.setRemark("用户反馈");
                    }