花城 【小程序】统计排行添加是否是问题清单标识5

lidongdong

2024-07-11 eef6d2bcdb29348efe4ef17bc45a4c6886b487b1

 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();
@@ -266,7 +267,7 @@
     */
    @Override
    @Transactional
    public R putlMicroWish(ComActMicroWishVO comActMicroWishVO) {
    public synchronized R putlMicroWish(ComActMicroWishVO comActMicroWishVO) {
        Long id = comActMicroWishVO.getId();
        int type = comActMicroWishVO.getType().intValue();
        String rejectReason = comActMicroWishVO.getRejectReason();
@@ -285,6 +286,7 @@
        if(microWishDO == null){
            return R.fail("未查询到该微心愿记录");
        }

//        1 审核通过 2驳回 3分配人员 4发起活动 5反馈
        switch (type){
            case 1:
@@ -314,6 +316,15 @@
                comActMicroWishOperationRecordMapper.insert(comActMicroWishOperationRecordDO);
                break;
            case 3:
                /**
                 * 状态
                 * 状态 1待审核  2待分配 3进行中  4已驳回 5待确认6 已完成
                 */
                if(comActMicroWishDO.getStatus()!=null && comActMicroWishDO.getStatus()!=2)
                {
                    return R.fail("该微心愿已认领，不可重复认领");
                }

                isUpdate = true;
                comActMicroWishDO.setDistributionAt(date);
                comActMicroWishDO.setResponsibleId(responsibleId);
@@ -324,10 +335,18 @@
                }
                //添加操作记录
                comActMicroWishOperationRecordDO.setType(ComActMicroWishOperationRecordDO.type.fp);
                if(comActMicroWishDO.getForm()==3)
                if(comActMicroWishDO.getForm()!=null)
                {
                    comActMicroWishOperationRecordDO.setContent("认领心愿");
                    comActMicroWishOperationRecordDO.setRemark("认领心愿");
                    if(comActMicroWishDO.getForm()==3)
                    {
                        comActMicroWishOperationRecordDO.setContent("认领心愿");
                        comActMicroWishOperationRecordDO.setRemark("认领心愿");
                    }
                    else
                    {
                        comActMicroWishOperationRecordDO.setContent("分配心愿");
                        comActMicroWishOperationRecordDO.setRemark("分配心愿");
                    }
                }
                else
                {
@@ -389,7 +408,7 @@
                    //添加操作记录
                    comActMicroWishOperationRecordDO.setType(ComActMicroWishOperationRecordDO.type.fk);
                    comActMicroWishOperationRecordDO.setContent(feedback);
                    if(microWishDO.getForm()==3)
                    if(comActMicroWishVO.getForm()==null || comActMicroWishVO.getForm() ==3  )
                    {
                        comActMicroWishOperationRecordDO.setRemark("用户反馈");
                    }