Browse Source

企业上报完善

feature/screenDataPush
songyunpeng 4 years ago
parent
commit
26874c3bb7
  1. 17
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java
  2. 36
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomInfoController.java
  3. 31
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java
  4. 16
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java
  5. 33
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java
  6. 26
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java
  7. 31
      esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EnterpriseReportAddFormDTO.java
  8. 2
      esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EnterpriseReportFormDTO.java
  9. 13
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprisereport/controller/EnterpriseReportController.java
  10. 8
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprisereport/service/EnterpriseReportService.java
  11. 121
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprisereport/service/impl/EnterpriseReportServiceImpl.java
  12. 3
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/enterprisereport/EnterpriseReportDao.xml

17
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java

@ -4,9 +4,11 @@ import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.dto.DeptOption;
import com.elink.esua.epdc.dto.epdc.form.WorkUserEventTagRelationFormDTO;
import com.elink.esua.epdc.dto.epdc.result.WorkUserEventTagRelationResultDTO;
import com.elink.esua.epdc.service.AdminService;
import com.elink.esua.epdc.service.AppUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -29,6 +31,9 @@ public class ApiAdminController {
@Autowired
private AdminService adminService;
@Autowired
private AppUserService appUserService;
/**
* 获取完整机构名称市区/街道/社区/网格
*
@ -67,5 +72,17 @@ public class ApiAdminController {
ValidatorUtils.validateEntity(formDto);
return adminService.eventTagWorkUser(formDto);
}
/**
* @Description 获取机构树
* @Author songyunpeng
* @Date 2021/8/4
* @Param []
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
**/
@GetMapping("getDeptTreeWithTypeKey")
public Result<DeptOption> getDeptTreeWithTypeKey() {
return appUserService.getDeptTreeWithTypeKey();
}
}

36
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomInfoController.java

@ -4,6 +4,7 @@ import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.dto.EnterpriseReportDTO;
import com.elink.esua.epdc.dto.form.*;
import com.elink.esua.epdc.dto.result.*;
import com.elink.esua.epdc.service.CustomService;
@ -408,4 +409,39 @@ public class ApiCustomInfoController {
public Result<AdviceResultDTO> adviceDetail(@PathVariable("id") String id) {
return customService.getAdviceById(id);
}
/**
* @Description 小程序获取企业上报列表
* @Author songyunpeng
* @Date 2021/8/2
* @Param []
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.EnterpriseReportDTO>
**/
@GetMapping("/getEnterpriseReportList")
public Result<List<EnterpriseReportDTO>> getEnterpriseReportList(@LoginUser TokenDto userDetail, EnterpriseReportFormDTO enterpriseReportFormDTO){
return customService.getEnterpriseReportList(userDetail,enterpriseReportFormDTO);
}
/**
* @Description 小程序获取企业上报详情
* @Author songyunpeng
* @Date 2021/8/2
* @Param []
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.EnterpriseReportDTO>
**/
@GetMapping("/getEnterpriseReportDetail/{id}")
public Result<EnterpriseReportDTO> getEnterpriseReportList(@PathVariable String id){
return customService.getEnterpriseReportList(id);
}
/**
* @Description 新增企业上报
* @Author songyunpeng
* @Date 2021/8/2
* @Param [enterpriseReportAddFormDTO]
* @return com.elink.esua.epdc.commons.tools.utils.Result
**/
@PostMapping("/addEnterpriseReport")
public Result addEnterpriseReport(@LoginUser TokenDto userDetail, @RequestBody EnterpriseReportAddFormDTO enterpriseReportAddFormDTO){
return customService.addEnterpriseReport(userDetail,enterpriseReportAddFormDTO);
}
}

31
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java

@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.EnterpriseReportDTO;
import com.elink.esua.epdc.dto.form.*;
import com.elink.esua.epdc.dto.result.*;
import com.elink.esua.epdc.feign.fallback.CustomFeignClientFallback;
@ -367,4 +368,34 @@ public interface CustomFeignClient {
@GetMapping(value = "custom/epdc-app/advice/detail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<AdviceResultDTO> adviceDetail(@PathVariable("id") String id);
/**
* @Description 小程序获取企业上报列表
* @Author songyunpeng
* @Date 2021/8/2
* @Param []
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.EnterpriseReportDTO>
**/
@GetMapping(value = "custom/enterprisereport/getEnterpriseReportList", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<List<EnterpriseReportDTO>> getEnterpriseReportList(EnterpriseReportFormDTO enterpriseReportFormDTO);
/**
* @Description 小程序获取企业上报详情
* @Author songyunpeng
* @Date 2021/8/2
* @Param []
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.EnterpriseReportDTO>
**/
@GetMapping(value = "custom/enterprisereport/getEnterpriseReportDetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<EnterpriseReportDTO> getEnterpriseReportList(@PathVariable String id);
/**
* @Description 新增企业上报
* @Author songyunpeng
* @Date 2021/8/2
* @Param [enterpriseReportAddFormDTO]
* @return com.elink.esua.epdc.commons.tools.utils.Result
**/
@PostMapping(value = "custom/enterprisereport/addEnterpriseReport", consumes = MediaType.APPLICATION_JSON_VALUE)
Result addEnterpriseReport(@RequestBody EnterpriseReportAddFormDTO enterpriseReportAddFormDTO);
}

16
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java

@ -4,6 +4,7 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.EnterpriseReportDTO;
import com.elink.esua.epdc.dto.form.*;
import com.elink.esua.epdc.dto.result.*;
import com.elink.esua.epdc.feign.CustomFeignClient;
@ -199,4 +200,19 @@ public class CustomFeignClientFallback implements CustomFeignClient {
public Result<AdviceResultDTO> adviceDetail(String id) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "AdviceDetail", id);
}
@Override
public Result<List<EnterpriseReportDTO>> getEnterpriseReportList(EnterpriseReportFormDTO enterpriseReportFormDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getEnterpriseReportList", enterpriseReportFormDTO);
}
@Override
public Result<EnterpriseReportDTO> getEnterpriseReportList(String id) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getEnterpriseReportList", id);
}
@Override
public Result addEnterpriseReport(EnterpriseReportAddFormDTO enterpriseReportAddFormDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "addEnterpriseReport", enterpriseReportAddFormDTO);
}
}

33
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java

@ -4,6 +4,7 @@ import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.DeptOption;
import com.elink.esua.epdc.dto.EnterpriseReportDTO;
import com.elink.esua.epdc.dto.form.*;
import com.elink.esua.epdc.dto.result.*;
@ -332,7 +333,7 @@ public interface CustomService {
**/
Result<List<EpdcSelectEvaluationListResultDTO>> getEvaluationList(EpdcSelectEvaluationListFormDTO formDTO);
/**
* @Description 提交建议
* @Description 提交建议
* @Author songyunpeng
* @Date 2021/3/4
* @Param [formDto, tokenDto]
@ -340,7 +341,7 @@ public interface CustomService {
**/
Result adviceSubmit(AdviceSubmitFormDTO formDto, TokenDto tokenDto);
/**
* @Description 建议列表
* @Description 建议列表
* @Author songyunpeng
* @Date 2021/3/4
* @Param [formDto, tokenDto]
@ -348,11 +349,37 @@ public interface CustomService {
**/
Result<List<AdviceResultDTO>> listAdvice(AdviceListFormDTO formDto, TokenDto tokenDto);
/**
* @Description 建议详情
* @Description 建议详情
* @Author songyunpeng
* @Date 2021/3/4
* @Param [id]
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.AdviceResultDTO>
**/
Result<AdviceResultDTO> getAdviceById(String id);
/**
* @Description 小程序获取企业上报列表
* @Author songyunpeng
* @Date 2021/8/2
* @Param []
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.EnterpriseReportDTO>
**/
Result<List<EnterpriseReportDTO>> getEnterpriseReportList(TokenDto userDetail, EnterpriseReportFormDTO enterpriseReportFormDTO);
/**
* @Description 新增企业上报
* @Author songyunpeng
* @Date 2021/8/2
* @Param [enterpriseReportAddFormDTO]
* @return com.elink.esua.epdc.commons.tools.utils.Result
**/
Result addEnterpriseReport(TokenDto userDetail, EnterpriseReportAddFormDTO enterpriseReportAddFormDTO);
/**
* @Description 小程序获取企业上报详情
* @Author songyunpeng
* @Date 2021/8/2
* @Param []
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.EnterpriseReportDTO>
**/
Result<EnterpriseReportDTO> getEnterpriseReportList(String id);
}

26
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java

@ -5,6 +5,7 @@ import com.elink.esua.epdc.commons.tools.exception.RenException;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.DeptOption;
import com.elink.esua.epdc.dto.EnterpriseReportDTO;
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
import com.elink.esua.epdc.dto.VolunteerInfoDTO;
import com.elink.esua.epdc.dto.form.*;
@ -391,4 +392,29 @@ public class CustomServiceImpl implements CustomService {
return customFeignClient.adviceDetail(id);
}
@Override
public Result<List<EnterpriseReportDTO>> getEnterpriseReportList(TokenDto userDetail,EnterpriseReportFormDTO enterpriseReportFormDTO) {
enterpriseReportFormDTO.setUserId(userDetail.getUserId());
return customFeignClient.getEnterpriseReportList(enterpriseReportFormDTO);
}
@Override
public Result addEnterpriseReport(TokenDto userDetail, EnterpriseReportAddFormDTO enterpriseReportAddFormDTO) {
// 机构信息
Result<ParentAndAllDeptDTO> dtoResult = adminFeignClient.getParentAndAllDept(userDetail.getGridId());
ParentAndAllDeptDTO deptDTO = dtoResult.getData();
enterpriseReportAddFormDTO.setDept(deptDTO.getGrid());
enterpriseReportAddFormDTO.setDeptId(deptDTO.getGridId());
enterpriseReportAddFormDTO.setMobile(userDetail.getMobile());
enterpriseReportAddFormDTO.setRealName(userDetail.getRealName());
enterpriseReportAddFormDTO.setFaceImg(userDetail.getFaceImg());
enterpriseReportAddFormDTO.setUserId(userDetail.getUserId());
return customFeignClient.addEnterpriseReport(enterpriseReportAddFormDTO);
}
@Override
public Result<EnterpriseReportDTO> getEnterpriseReportList(String id) {
return customFeignClient.getEnterpriseReportList(id);
}
}

31
esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EnterpriseReportAddFormDTO.java

@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import java.io.Serializable;
import java.math.BigDecimal;
@ -38,12 +39,14 @@ public class EnterpriseReportAddFormDTO implements Serializable {
* 公司名称
*/
@NotBlank(message = "公司名称不能为空")
@Size(min = 1, max = 100, message = "公司名称不能为空且在100个字以内")
private String enterpriseName;
/**
* 法人或联络人
*/
@NotBlank(message = " 法人或联络人不能为空")
@Size(min = 1, max = 50, message = "法人或联络人不能为空且在50个字以内")
private String legalPerson;
/**
@ -70,4 +73,32 @@ public class EnterpriseReportAddFormDTO implements Serializable {
* 问题
*/
private String question;
/**
* 发布人手机号
*/
private String mobile;
/**
* 发布人头像
*/
private String faceImg;
/**
* 发布人真实姓名
*/
private String realName;
/**
* 发布人所属网格
*/
private String dept;
/**
* 发布人所属网格ID
*/
private Long deptId;
private String userId;
}

2
esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EnterpriseReportFormDTO.java

@ -28,6 +28,6 @@ public class EnterpriseReportFormDTO implements Serializable {
@Min(value = 1, message = "页容量必须大于0")
private Integer pageSize;
private Long userId;
private String userId;
}

13
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprisereport/controller/EnterpriseReportController.java

@ -101,9 +101,20 @@ public class EnterpriseReportController {
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.EnterpriseReportDTO>
**/
@GetMapping("/getEnterpriseReportList")
public Result<List<EnterpriseReportDTO>> getEnterpriseReportList(EnterpriseReportFormDTO enterpriseReportFormDTO){
public Result<List<EnterpriseReportDTO>> getEnterpriseReportList(@RequestBody EnterpriseReportFormDTO enterpriseReportFormDTO){
return enterpriseReportService.getEnterpriseReportList(enterpriseReportFormDTO);
}
/**
* @Description 小程序获取企业上报详情
* @Author songyunpeng
* @Date 2021/8/2
* @Param []
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.EnterpriseReportDTO>
**/
@GetMapping("/getEnterpriseReportDetail/{id}")
public Result<EnterpriseReportDTO> getEnterpriseReportDetail(@PathVariable String id){
return enterpriseReportService.getEnterpriseReportDetail(id);
}
/**
* @Description 新增企业上报
* @Author songyunpeng

8
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprisereport/service/EnterpriseReportService.java

@ -111,4 +111,12 @@ public interface EnterpriseReportService extends BaseService<EnterpriseReportEnt
* @return com.elink.esua.epdc.commons.tools.utils.Result
**/
Result addEnterpriseReport(EnterpriseReportAddFormDTO enterpriseReportAddFormDTO);
/**
* @Description 小程序获取企业上报详情
* @Author songyunpeng
* @Date 2021/8/4
* @Param [id]
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.EnterpriseReportDTO>
**/
Result<EnterpriseReportDTO> getEnterpriseReportDetail(String id);
}

121
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprisereport/service/impl/EnterpriseReportServiceImpl.java

@ -23,17 +23,19 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.commons.tools.constant.NumConstant;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.EnterpriseReportDTO;
import com.elink.esua.epdc.dto.SysSimpleDictDTO;
import com.elink.esua.epdc.dto.form.EnterpriseReportAddFormDTO;
import com.elink.esua.epdc.dto.form.EnterpriseReportFormDTO;
import com.elink.esua.epdc.modules.enterprisereport.dao.EnterpriseReportDao;
import com.elink.esua.epdc.modules.enterprisereport.entity.EnterpriseReportEntity;
import com.elink.esua.epdc.modules.enterprisereport.service.EnterpriseReportService;
import com.elink.esua.epdc.modules.feign.AdminFeignClient;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -50,6 +52,8 @@ import java.util.Map;
@Service
public class EnterpriseReportServiceImpl extends BaseServiceImpl<EnterpriseReportDao, EnterpriseReportEntity> implements EnterpriseReportService {
@Autowired
private AdminFeignClient adminFeignClient;
@Override
public PageData<EnterpriseReportDTO> page(Map<String, Object> params) {
@ -68,16 +72,20 @@ public class EnterpriseReportServiceImpl extends BaseServiceImpl<EnterpriseRepor
}
private QueryWrapper<EnterpriseReportEntity> getWrapper(Map<String, Object> params){
String gridId = (String)params.get("GRID_ID");
String year = (String)params.get("YEAR");
String quarter = (String)params.get("QUARTER");
String enterpriseName = (String)params.get("ENTERPRISE_NAME");
String legalPerson = (String)params.get("LEGAL_PERSON");
String concat = (String)params.get("CONCAT");
String enterpriseStatus = (String)params.get("ENTERPRISE_STATUS");
String gridId = (String)params.get("gridId");
String communityId = (String)params.get("communityId");
String streetId = (String)params.get("streetId");
String year = (String)params.get("year");
String quarter = (String)params.get("quarter");
String enterpriseName = (String)params.get("enterpriseName");
String legalPerson = (String)params.get("legalPerson");
String concat = (String)params.get("concat");
String enterpriseStatus = (String)params.get("enterpriseStatus");
QueryWrapper<EnterpriseReportEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(gridId), "GRID_ID", gridId);
wrapper.apply(StringUtils.isNotBlank(gridId),"FIND_IN_SET ("+gridId+",ALL_DEPT_IDS)");
wrapper.apply(StringUtils.isNotBlank(communityId),"FIND_IN_SET ("+communityId+",ALL_DEPT_IDS)");
wrapper.apply(StringUtils.isNotBlank(streetId),"FIND_IN_SET ("+streetId+",ALL_DEPT_IDS)");
wrapper.eq(StringUtils.isNotBlank(year), "YEAR", year);
wrapper.eq(StringUtils.isNotBlank(quarter), "QUARTER", quarter);
wrapper.like(StringUtils.isNotBlank(enterpriseName), "ENTERPRISE_NAME", enterpriseName);
@ -117,34 +125,49 @@ public class EnterpriseReportServiceImpl extends BaseServiceImpl<EnterpriseRepor
@Override
public Result<List<EnterpriseReportDTO>> getEnterpriseReportList(EnterpriseReportFormDTO formDTO) {
Long userId = SecurityUser.getUserId();
if(userId == null){
return new Result<List<EnterpriseReportDTO>>().error("无法获取到用户ID");
}
formDTO.setUserId(userId);
int pageIndex = (formDTO.getPageIndex() - NumConstant.ONE) * formDTO.getPageSize();
formDTO.setPageIndex(pageIndex);
List<EnterpriseReportDTO> list = this.baseDao.getEnterpriseReportList(formDTO);
//处理字典信息
formatList(list);
return new Result().ok(list);
}
private void formatList(List<EnterpriseReportDTO> list) {
Result<List<SysSimpleDictDTO>> enterpriseStatusRes = adminFeignClient.getListSimpleByDictType("enterprise_status");
if(enterpriseStatusRes.success()){
List<SysSimpleDictDTO> dict = enterpriseStatusRes.getData();
for (SysSimpleDictDTO sysSimpleDictDTO : dict) {
for (EnterpriseReportDTO enterpriseReportDTO : list) {
if(enterpriseReportDTO.getEnterpriseStatus().equals(sysSimpleDictDTO.getDictValue())){
enterpriseReportDTO.setEnterpriseStatus(sysSimpleDictDTO.getDictName());
}
}
}
}
Result<List<SysSimpleDictDTO>> enterpriseQuarterRes = adminFeignClient.getListSimpleByDictType("enterprise_quarter");
if(enterpriseQuarterRes.success()){
List<SysSimpleDictDTO> dict = enterpriseQuarterRes.getData();
for (SysSimpleDictDTO sysSimpleDictDTO : dict) {
for (EnterpriseReportDTO enterpriseReportDTO : list) {
if(enterpriseReportDTO.getQuarter().equals(sysSimpleDictDTO.getDictValue())){
enterpriseReportDTO.setQuarter(sysSimpleDictDTO.getDictName());
}
}
}
}
}
@Override
public Result addEnterpriseReport(EnterpriseReportAddFormDTO enterpriseReportAddFormDTO) {
UserDetail user = SecurityUser.getUser();
if(user == null){
return new Result<List<EnterpriseReportDTO>>().error("无法获取到用户");
}
QueryWrapper<EnterpriseReportEntity> entityQueryWrapper =new QueryWrapper<>();
entityQueryWrapper.eq("YEAR",enterpriseReportAddFormDTO.getYear());
entityQueryWrapper.eq("QUARTER",enterpriseReportAddFormDTO.getQuarter());
entityQueryWrapper.eq("ENTERPRISE_NAME",enterpriseReportAddFormDTO.getEnterpriseName());
EnterpriseReportEntity enterpriseReportEntity = new EnterpriseReportEntity();
enterpriseReportEntity.setDept(user.getDeptName());
enterpriseReportEntity.setDeptId(user.getDeptId());
enterpriseReportEntity.setMobile(user.getMobile());
enterpriseReportEntity.setRealName(user.getRealName());
enterpriseReportEntity.setFaceImg(user.getHeadUrl());
enterpriseReportEntity.setDept(enterpriseReportAddFormDTO.getDept());
enterpriseReportEntity.setDeptId(enterpriseReportAddFormDTO.getDeptId());
enterpriseReportEntity.setMobile(enterpriseReportAddFormDTO.getMobile());
enterpriseReportEntity.setRealName(enterpriseReportAddFormDTO.getRealName());
enterpriseReportEntity.setFaceImg(enterpriseReportAddFormDTO.getFaceImg());
enterpriseReportEntity.setUserId(enterpriseReportAddFormDTO.getUserId());
enterpriseReportEntity.setYear(enterpriseReportAddFormDTO.getYear());
enterpriseReportEntity.setQuarter(enterpriseReportAddFormDTO.getQuarter());
enterpriseReportEntity.setEnterpriseName(enterpriseReportAddFormDTO.getEnterpriseName());
@ -154,7 +177,23 @@ public class EnterpriseReportServiceImpl extends BaseServiceImpl<EnterpriseRepor
enterpriseReportEntity.setEnterpriseIncome(enterpriseReportAddFormDTO.getEnterpriseIncome());
enterpriseReportEntity.setEnterprisePeopleNum(enterpriseReportAddFormDTO.getEnterprisePeopleNum());
enterpriseReportEntity.setQuestion(enterpriseReportAddFormDTO.getQuestion());
//获取部门信息
Result<ParentAndAllDeptDTO> parentAndAllDept = adminFeignClient.getParentAndAllDept(Long.parseLong(enterpriseReportAddFormDTO.getGridId()));
if(!parentAndAllDept.success()){
return new Result().error("获取部门信息失败");
}
ParentAndAllDeptDTO parentAndAllDeptDTO = parentAndAllDept.getData();
enterpriseReportEntity.setGrid(parentAndAllDeptDTO.getGrid());
enterpriseReportEntity.setGridId(parentAndAllDeptDTO.getGridId());
enterpriseReportEntity.setAllDeptIds(parentAndAllDeptDTO.getAllDeptIds());
enterpriseReportEntity.setAllDeptNames(parentAndAllDeptDTO.getAllDeptNames());
enterpriseReportEntity.setParentDeptIds(parentAndAllDeptDTO.getParentDeptIds());
enterpriseReportEntity.setParentDeptNames(parentAndAllDeptDTO.getParentDeptNames());
//校验唯一性
QueryWrapper<EnterpriseReportEntity> entityQueryWrapper =new QueryWrapper<>();
entityQueryWrapper.eq("YEAR",enterpriseReportAddFormDTO.getYear());
entityQueryWrapper.eq("QUARTER",enterpriseReportAddFormDTO.getQuarter());
entityQueryWrapper.eq("ENTERPRISE_NAME",enterpriseReportAddFormDTO.getEnterpriseName());
List<EnterpriseReportEntity> enterpriseReportEntities = baseDao.selectList(entityQueryWrapper);
if(enterpriseReportEntities.size()>1){
enterpriseReportEntity.setId(enterpriseReportEntities.get(0).getId());
@ -165,5 +204,29 @@ public class EnterpriseReportServiceImpl extends BaseServiceImpl<EnterpriseRepor
return new Result();
}
@Override
public Result<EnterpriseReportDTO> getEnterpriseReportDetail(String id) {
EnterpriseReportDTO enterpriseReportDTO = get(id);
Result<List<SysSimpleDictDTO>> enterpriseStatusRes = adminFeignClient.getListSimpleByDictType("enterprise_status");
if(enterpriseStatusRes.success()){
List<SysSimpleDictDTO> dict = enterpriseStatusRes.getData();
for (SysSimpleDictDTO sysSimpleDictDTO : dict) {
if(enterpriseReportDTO.getEnterpriseStatus().equals(sysSimpleDictDTO.getDictValue())){
enterpriseReportDTO.setEnterpriseStatus(sysSimpleDictDTO.getDictName());
}
}
}
Result<List<SysSimpleDictDTO>> enterpriseQuarterRes = adminFeignClient.getListSimpleByDictType("enterprise_quarter");
if(enterpriseQuarterRes.success()){
List<SysSimpleDictDTO> dict = enterpriseQuarterRes.getData();
for (SysSimpleDictDTO sysSimpleDictDTO : dict) {
if(enterpriseReportDTO.getQuarter().equals(sysSimpleDictDTO.getDictValue())){
enterpriseReportDTO.setQuarter(sysSimpleDictDTO.getDictName());
}
}
}
return new Result<EnterpriseReportDTO>().ok(enterpriseReportDTO);
}
}

3
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/enterprisereport/EnterpriseReportDao.xml

@ -51,7 +51,8 @@
CONCAT,
ENTERPRISE_STATUS,
ENTERPRISE_INCOME,
ENTERPRISE_PEOPLE_NUM
ENTERPRISE_PEOPLE_NUM,
CREATED_TIME
from epdc_enterprise_report
where DEL_FLAG = '0' and USER_ID = #{userId}
order by CREATED_TIME desc

Loading…
Cancel
Save