springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserServiceImpl.java
@@ -99,6 +99,7 @@ integralCountDTO.setUserId(userId); integralCountDTO.setCommunityId(communityId); integralCountDTO.setType(ComActIntegralUserTradeDO.changeType.add); integralCountDTO.setServiceType(integralUserRule.getIntegralType()); if(integralUserRule.getType().equals(ComActIntegralRuleDO.type.month)){ integralCountDTO.setStartTime(DateUtils.getFirstDayOfMonthString()); integralCountDTO.setEndTime(DateUtils.getLastDayOfMonthString()); @@ -190,7 +191,7 @@ integralRuleWXYDO.setIsRestrict(1); integralRuleWXYDO.setType(ComActIntegralRuleDO.type.month); integralRuleWXYDO.setCount(0); integralRuleWXYDO.setIntegralType(ComActIntegralRuleDO.integralType.fbssp); integralRuleWXYDO.setIntegralType(ComActIntegralRuleDO.integralType.fbwxy); integralRuleList.add(integralRuleWXYDO); //议事投票默认积分规则 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java
@@ -15,6 +15,7 @@ import com.panzhihua.common.model.vos.community.ComSwDangerReportVO; import com.panzhihua.common.model.vos.community.ComSwSafetyWorkRecordVO; import com.panzhihua.common.service.user.UserService; import com.panzhihua.common.utlis.DateUtils; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.service_community.dao.ComSwDangerReportDAO; import com.panzhihua.service_community.dao.ComSwPatrolRecordDAO; @@ -30,10 +31,7 @@ import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.*; /** * @auther txb @@ -313,6 +311,7 @@ } BeanUtils.copyProperties(comSwDangerReportRectifyDTO, comSwDangerReportDO); comSwDangerReportDO.setStatus(String.valueOf(SafeWordStatusEnum.YZG.getCode())); comSwDangerReportDO.setRectifyTime(DateUtils.getCurrentDateStr()); int update = comSwDangerReportDAO.updateById(comSwDangerReportDO); if (update > 0) { return R.ok();
