elink-star
/
epdc-cloud-property-yushan
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

format

hotfix/yujt_opt
zhangyuan 5 years ago
parent
69ea031be5
commit
9613e34541
6 changed files with 16 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/controller/AppActivityInfoController.java
  2. 15
      epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/police/service/impl/PoliceServiceImpl.java
  3. 4
      epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/AppPropertyProjectController.java
  4. 4
      epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/PropertyController.java
  5. 4
      epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/PropertyProjectController.java
  6. 2
      epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/PropertyProjectScoreController.java

4
epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/controller/AppActivityInfoController.java
View File

@ -22,13 +22,13 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
import com.elink.esua.epdc.modules.smile.activity.service.ActivityInfoService;
import com.elink.esua.epdc.modules.smile.activity.service.ActivityParticipantService;
import com.elink.esua.epdc.smile.dto.activity.form.ActivityDetailFormDTO;
import com.elink.esua.epdc.smile.dto.activity.form.ActivityInfoFormDTO;
import com.elink.esua.epdc.smile.dto.activity.form.ActivityParticipantFormDTO;
import com.elink.esua.epdc.smile.dto.activity.result.ActivityDetailResultDTO;
import com.elink.esua.epdc.smile.dto.activity.result.ActivityInfoResultDTO;
import com.elink.esua.epdc.modules.smile.activity.service.ActivityInfoService;
import com.elink.esua.epdc.modules.smile.activity.service.ActivityParticipantService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

15
epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/police/service/impl/PoliceServiceImpl.java
View File

@ -30,13 +30,6 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO;
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
import com.elink.esua.epdc.smile.dto.constant.GroupConstant;
import com.elink.esua.epdc.smile.dto.enums.GroupStateEnum;
import com.elink.esua.epdc.smile.dto.events.form.GroupFormDTO;
import com.elink.esua.epdc.smile.dto.group.GroupDTO;
import com.elink.esua.epdc.smile.dto.police.PoliceDTO;
import com.elink.esua.epdc.smile.dto.police.form.PoliceFormDTO;
import com.elink.esua.epdc.smile.dto.police.result.PoliceResultDTO;
import com.elink.esua.epdc.modules.smile.feign.AdminFeignClient;
import com.elink.esua.epdc.modules.smile.feign.EventFeignClient;
import com.elink.esua.epdc.modules.smile.group.dao.GroupDao;
@ -48,6 +41,13 @@ import com.elink.esua.epdc.modules.smile.police.redis.PoliceRedis;
import com.elink.esua.epdc.modules.smile.police.service.PoliceService;
import com.elink.esua.epdc.modules.smile.rocketmq.dto.OrganizationModifyDTO;
import com.elink.esua.epdc.modules.smile.topic.service.TopicService;
import com.elink.esua.epdc.smile.dto.constant.GroupConstant;
import com.elink.esua.epdc.smile.dto.enums.GroupStateEnum;
import com.elink.esua.epdc.smile.dto.events.form.GroupFormDTO;
import com.elink.esua.epdc.smile.dto.group.GroupDTO;
import com.elink.esua.epdc.smile.dto.police.PoliceDTO;
import com.elink.esua.epdc.smile.dto.police.form.PoliceFormDTO;
import com.elink.esua.epdc.smile.dto.police.result.PoliceResultDTO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -347,7 +347,6 @@ public class PoliceServiceImpl extends BaseServiceImpl<PoliceDao, PoliceEntity>
groupEntity.setState(GroupStateEnum.GROUP_STATE_EXAMINATION_PASSED.getValue());
groupEntity.setGroupAvatar(GroupConstant.PROPERTY_GROUP_AVATAR);
groupEntity.setGroupName(gridName + "警民群");
// groupEntity.setGroupCategory(GroupConstant.POLICE_GROUP_CATEGORY);
groupEntity.setSectionCode(GroupConstant.POLICE_GROUP_SECTION);
groupEntity.setCategoryCode(GroupConstant.POLICE_GROUP_CATEGORY_CODE);
groupEntity.setTypeKey(OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY);

4
epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/AppPropertyProjectController.java
View File

@ -19,13 +19,13 @@ package com.elink.esua.epdc.modules.smile.project.controller;
import com.elink.esua.epdc.commons.tools.constant.Constant;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.modules.smile.project.service.PropertyProjectScoreService;
import com.elink.esua.epdc.modules.smile.project.service.PropertyProjectService;
import com.elink.esua.epdc.smile.dto.project.form.ProjectDetailFormDTO;
import com.elink.esua.epdc.smile.dto.project.form.ProjectListFormDTO;
import com.elink.esua.epdc.smile.dto.project.form.ProjectScoreFormDTO;
import com.elink.esua.epdc.smile.dto.project.result.ProjectDetailResultDTO;
import com.elink.esua.epdc.smile.dto.project.result.ProjectListResultDTO;
import com.elink.esua.epdc.modules.smile.project.service.PropertyProjectScoreService;
import com.elink.esua.epdc.modules.smile.project.service.PropertyProjectService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;

4
epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/PropertyController.java
View File

@ -25,10 +25,10 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.smile.dto.project.PropertyDTO;
import com.elink.esua.epdc.smile.dto.project.result.PropertyDictListResultDTO;
import com.elink.esua.epdc.modules.smile.project.excel.PropertyExcel;
import com.elink.esua.epdc.modules.smile.project.service.PropertyService;
import com.elink.esua.epdc.smile.dto.project.PropertyDTO;
import com.elink.esua.epdc.smile.dto.project.result.PropertyDictListResultDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

4
epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/PropertyProjectController.java
View File

@ -26,9 +26,9 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.smile.dto.project.PropertyProjectDTO;
import com.elink.esua.epdc.modules.smile.project.excel.PropertyProjectExcel;
import com.elink.esua.epdc.modules.smile.project.service.PropertyProjectService;
import com.elink.esua.epdc.smile.dto.project.PropertyProjectDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -51,7 +51,7 @@ public class PropertyProjectController {
private PropertyProjectService propertyProjectService;
@GetMapping("page")
@DataFilter(tableAlias = "ep", deptId = "grid_id", prefix = "and",isPendingCreator = false)
@DataFilter(tableAlias = "ep", deptId = "grid_id", prefix = "and", isPendingCreator = false)
public Result<PageData<PropertyProjectDTO>> page(@RequestParam Map<String, Object> params) {
PageData<PropertyProjectDTO> page = propertyProjectService.page(params);
return new Result<PageData<PropertyProjectDTO>>().ok(page);

2
epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/PropertyProjectScoreController.java
View File

@ -25,9 +25,9 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.smile.dto.project.PropertyProjectScoreDTO;
import com.elink.esua.epdc.modules.smile.project.excel.PropertyProjectScoreExcel;
import com.elink.esua.epdc.modules.smile.project.service.PropertyProjectScoreService;
import com.elink.esua.epdc.smile.dto.project.PropertyProjectScoreDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

Write Preview
Loading…
Cancel
Save