update

张天森

2022-10-08 d890012cee164443d15c080aaa9b8a86badec01a

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

@@ -428,14 +428,14 @@
     */
    @Override
    public R listActivitySign(ActivitySignVO activitySignVO) {
        ComActActivityDO comActActivityDO=comActActivityDAO.selectById(activitySignVO.getActivityId());
        if(comActActivityDO!=null){
            if(comActActivityDO.getType()==3||comActActivityDO.getType()==5){
                IPage<ActivitySignVO> activitySignVOS = comActActSignDAO
                        .listActivitySignParty(new Page(activitySignVO.getPageNum(), activitySignVO.getPageSize()), activitySignVO);
                return R.ok(activitySignVOS);
            }
        }
//        ComActActivityDO comActActivityDO=comActActivityDAO.selectById(activitySignVO.getActivityId());
//        if(comActActivityDO!=null){
//            if(comActActivityDO.getType()==3||comActActivityDO.getType()==5){
//                IPage<ActivitySignVO> activitySignVOS = comActActSignDAO
//                        .listActivitySignParty(new Page(activitySignVO.getPageNum(), activitySignVO.getPageSize()), activitySignVO);
//                return R.ok(activitySignVOS);
//            }
//        }
        IPage<ActivitySignVO> activitySignVOS = comActActSignDAO
            .listActivitySign(new Page(activitySignVO.getPageNum(), activitySignVO.getPageSize()), activitySignVO);
        return R.ok(activitySignVOS);
@@ -645,6 +645,7 @@
                comActActSignDO.setSignIdentity(signIdentity);
                comActActSignDO.setTimes(comActActSignDO.getTimes()+1);
                comActActSignDO.setIsInvite(isInvite);
                comActActSignDO.setCheckUnitId(signactivityVO.getCheckUnitId());
                num = comActActSignDAO.updateById(comActActSignDO);
            } else {
                comActActSignDO = new ComActActSignDO();
@@ -653,6 +654,7 @@
                comActActSignDO.setSignIdentity(signIdentity);
                comActActSignDO.setTimes(1);
                comActActSignDO.setIsInvite(isInvite);
                comActActSignDO.setCheckUnitId(signactivityVO.getCheckUnitId());
                num = comActActSignDAO.insert(comActActSignDO);
            }
        } else {
@@ -1111,6 +1113,7 @@
            comActActRegistDO.setCodeId(comActActRegistVO.getCodeId());
            comActActRegistDO.setAward(0);
            comActActRegistDO.setPosition(comActActRegistVO.getPosition());
            comActActRegistDO.setCheckUnitId(comActActSignDO.getCheckUnitId());
            comActActRegistDO.setTimes(signAllCount + 1);
            int result = comActActRegistDAO.insert(comActActRegistDO);
            if (result > 0) {