diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/controller/AppPropertyProjectController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/controller/AppPropertyProjectController.java index 6e303aa..62fc42e 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/controller/AppPropertyProjectController.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/controller/AppPropertyProjectController.java @@ -21,8 +21,10 @@ import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.project.form.ProjectDetailFormDTO; import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO; +import com.elink.esua.epdc.dto.project.form.ProjectScoreFormDTO; import com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO; import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO; +import com.elink.esua.epdc.modules.project.service.PropertyProjectScoreService; import com.elink.esua.epdc.modules.project.service.PropertyProjectService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -43,6 +45,9 @@ public class AppPropertyProjectController { @Autowired private PropertyProjectService propertyProjectService; + @Autowired + private PropertyProjectScoreService propertyProjectScoreService; + /** * 项目列表 * @@ -94,8 +99,8 @@ public class AppPropertyProjectController { * @since 2020/5/13 15:37 */ @GetMapping("projectScore") - public Result score(@RequestBody ProjectDetailFormDTO formDto) { - ProjectDetailResultDTO data = propertyProjectService.getProjectDetailById(formDto); - return new Result().ok(data); + public Result score(@RequestBody ProjectScoreFormDTO formDto) { + propertyProjectScoreService.score(formDto); + return new Result(); } } \ No newline at end of file diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/controller/PropertyProjectScoreController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/controller/PropertyProjectScoreController.java index 2fe2051..d0af9f2 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/controller/PropertyProjectScoreController.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/controller/PropertyProjectScoreController.java @@ -45,24 +45,24 @@ import java.util.Map; @RestController @RequestMapping("propertyprojectscore") public class PropertyProjectScoreController { - + @Autowired private PropertyProjectScoreService propertyProjectScoreService; @GetMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params) { PageData page = propertyProjectScoreService.page(params); return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ + public Result get(@PathVariable("id") String id) { PropertyProjectScoreDTO data = propertyProjectScoreService.get(id); return new Result().ok(data); } @PostMapping - public Result save(@RequestBody PropertyProjectScoreDTO dto){ + public Result save(@RequestBody PropertyProjectScoreDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); propertyProjectScoreService.save(dto); @@ -70,7 +70,7 @@ public class PropertyProjectScoreController { } @PutMapping - public Result update(@RequestBody PropertyProjectScoreDTO dto){ + public Result update(@RequestBody PropertyProjectScoreDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); propertyProjectScoreService.update(dto); @@ -78,7 +78,7 @@ public class PropertyProjectScoreController { } @DeleteMapping - public Result delete(@RequestBody String[] ids){ + public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); propertyProjectScoreService.delete(ids); @@ -90,5 +90,4 @@ public class PropertyProjectScoreController { List list = propertyProjectScoreService.list(params); ExcelUtils.exportExcelToTarget(response, null, list, PropertyProjectScoreExcel.class); } - } \ No newline at end of file diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/dao/PropertyProjectScoreDao.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/dao/PropertyProjectScoreDao.java index 79d0e22..ec2e9b7 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/dao/PropertyProjectScoreDao.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/dao/PropertyProjectScoreDao.java @@ -18,6 +18,8 @@ package com.elink.esua.epdc.modules.project.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.project.form.ProjectDetailFormDTO; +import com.elink.esua.epdc.dto.project.form.ProjectScoreFormDTO; import com.elink.esua.epdc.modules.project.entity.PropertyProjectScoreEntity; import org.apache.ibatis.annotations.Mapper; @@ -29,5 +31,13 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PropertyProjectScoreDao extends BaseDao { - + /** + * 物业打分 + * + * @return int + * @params [params] + * @author zhangyuan + * @since 2019/10/11 14:54 + */ + int deleteByIds(ProjectScoreFormDTO dto); } \ No newline at end of file diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/service/PropertyProjectScoreService.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/service/PropertyProjectScoreService.java index 822b01a..9202da7 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/service/PropertyProjectScoreService.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/service/PropertyProjectScoreService.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.project.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.project.PropertyProjectScoreDTO; +import com.elink.esua.epdc.dto.project.form.ProjectScoreFormDTO; import com.elink.esua.epdc.modules.project.entity.PropertyProjectScoreEntity; import java.util.List; @@ -92,4 +93,14 @@ public interface PropertyProjectScoreService extends BaseService getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -101,4 +102,13 @@ public class PropertyProjectScoreServiceImpl extends BaseServiceImpl - + @@ -17,5 +18,14 @@ + + DELETE + FROM + epdc_property_project_score + WHERE + PROJECT_ID = #{projectId} + AND PROPERTY_ID = #{propertyId} + AND USER_ID = #{userId} + \ No newline at end of file