Commit 63e65f8a authored by zhangyingbin's avatar zhangyingbin

修改企业审核接口、修改新增项目接口

parent dc65220b
...@@ -106,4 +106,5 @@ public class ProjectDto extends BaseDto { ...@@ -106,4 +106,5 @@ public class ProjectDto extends BaseDto {
private String insDep; private String insDep;
private String insPerson; private String insPerson;
private String startDateString;
} }
package com.yeejoin.amos.boot.module.ugp.api.mapper; package com.yeejoin.amos.boot.module.ugp.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.ugp.api.dto.CompanyDto; import com.yeejoin.amos.boot.module.ugp.api.dto.CompanyDto;
import com.yeejoin.amos.boot.module.ugp.api.entity.Company; import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
...@@ -17,5 +18,5 @@ import java.util.List; ...@@ -17,5 +18,5 @@ import java.util.List;
*/ */
@Mapper @Mapper
public interface CompanyMapper extends BaseMapper<Company> { public interface CompanyMapper extends BaseMapper<Company> {
List<CompanyDto> queryCompanyPage(Company companyParam); IPage<CompanyDto> queryCompanyPage(IPage<CompanyDto> page,Company companyParam);
} }
...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.ugp.api.service; ...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.ugp.api.service;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.ugp.api.dto.CompanyDto; import com.yeejoin.amos.boot.module.ugp.api.dto.CompanyDto;
import com.yeejoin.amos.boot.module.ugp.api.entity.Company; import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
...@@ -14,7 +15,7 @@ import com.yeejoin.amos.boot.module.ugp.api.entity.Company; ...@@ -14,7 +15,7 @@ import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
*/ */
public interface ICompanyService { public interface ICompanyService {
Page<CompanyDto> queryCompanyPage(int current, int size,Company company); IPage<CompanyDto> queryCompanyPage(int current, int size, Company company);
......
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
<select id="queryCompanyPage" resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Company"> <select id="queryCompanyPage" resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Company">
select * from tz_ugp_company select * from tz_ugp_company
<where> <where>
<if test="name != '' and name != null"> <if test="companyParam.name != '' and companyParam.name != null">
and `name` like concat('%',#{name},'%') and `name` like concat('%',#{companyParam.name},'%')
</if> </if>
<if test="type != '' and type != null"> <if test="companyParam.type != '' and companyParam.type != null">
and `type` like concat('%',#{type},'%') and `type` like concat('%',#{companyParam.type},'%')
</if> </if>
</where> </where>
</select> </select>
......
...@@ -164,11 +164,10 @@ public class CompanyController extends BaseController { ...@@ -164,11 +164,10 @@ public class CompanyController extends BaseController {
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@GetMapping(value = "/page") @PostMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "企业信息表分页查询", notes = "企业信息表分页查询") @ApiOperation(httpMethod = "GET",value = "企业信息表分页查询", notes = "企业信息表分页查询")
public ResponseModel<Page<CompanyDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam public ResponseModel<IPage<CompanyDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size,Company company) { (value = "size") int size,@RequestBody Company company) {
return ResponseHelper.buildResponse(companyServiceImpl.queryCompanyPage(current,size,company)); return ResponseHelper.buildResponse(companyServiceImpl.queryCompanyPage(current,size,company));
} }
......
...@@ -28,6 +28,7 @@ import io.swagger.annotations.Api; ...@@ -28,6 +28,7 @@ import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
...@@ -77,7 +78,11 @@ public class ProjectController extends BaseController { ...@@ -77,7 +78,11 @@ public class ProjectController extends BaseController {
public ResponseModel<ProjectDto> save(@RequestBody ProjectDto model) { public ResponseModel<ProjectDto> save(@RequestBody ProjectDto model) {
String regionName = "",regionCode = ""; String regionName = "",regionCode = "";
Map<String,String> map = getInfo(regionName,regionCode,Long.valueOf(model.getInstallRegionCode())); Map<String,String> map = getInfo(regionName,regionCode,Long.valueOf(model.getInstallRegionCode()));
model.setStartDate(new Date()); try {
model.setStartDate(new SimpleDateFormat("yyy-MM-dd HH:mm:ss").parse(model.getStartDateString()));
} catch (ParseException e) {
e.printStackTrace();
}
model.setSubmitDate(new Date()); model.setSubmitDate(new Date());
model.setInstallationUnit(orgServiceImpl.getOrgUsrById(String.valueOf(model.getInstallationUnitId())).getBizOrgName()); model.setInstallationUnit(orgServiceImpl.getOrgUsrById(String.valueOf(model.getInstallationUnitId())).getBizOrgName());
model.setDesignUnit(orgServiceImpl.getOrgUsrById(String.valueOf(model.getDesignUnitId())).getBizOrgName()); model.setDesignUnit(orgServiceImpl.getOrgUsrById(String.valueOf(model.getDesignUnitId())).getBizOrgName());
...@@ -134,6 +139,11 @@ public class ProjectController extends BaseController { ...@@ -134,6 +139,11 @@ public class ProjectController extends BaseController {
@PutMapping(value = "/{sequenceNbr}") @PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新项目信息表", notes = "根据sequenceNbr更新项目信息表") @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新项目信息表", notes = "根据sequenceNbr更新项目信息表")
public ResponseModel<ProjectDto> updateBySequenceNbrProject(@RequestBody ProjectDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) { public ResponseModel<ProjectDto> updateBySequenceNbrProject(@RequestBody ProjectDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
try {
model.setStartDate(new SimpleDateFormat("yyy-MM-dd HH:mm:ss").parse(model.getStartDateString()));
} catch (ParseException e) {
e.printStackTrace();
}
model.setRecDate(new Date()); model.setRecDate(new Date());
model.setSequenceNbr(sequenceNbr); model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(projectServiceImpl.updateWithModel(model)); return ResponseHelper.buildResponse(projectServiceImpl.updateWithModel(model));
...@@ -162,6 +172,8 @@ public class ProjectController extends BaseController { ...@@ -162,6 +172,8 @@ public class ProjectController extends BaseController {
@GetMapping(value = "/{sequenceNbr}") @GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个项目信息表", notes = "根据sequenceNbr查询单个项目信息表") @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个项目信息表", notes = "根据sequenceNbr查询单个项目信息表")
public ResponseModel<ProjectDto> selectOne(@PathVariable Long sequenceNbr) { public ResponseModel<ProjectDto> selectOne(@PathVariable Long sequenceNbr) {
ProjectDto projectDto = projectServiceImpl.queryBySeq(sequenceNbr);
projectDto.setStartDateString(new SimpleDateFormat("yyy-MM-dd HH:mm:ss").format(projectDto.getStartDate()));
return ResponseHelper.buildResponse(projectServiceImpl.queryBySeq(sequenceNbr)); return ResponseHelper.buildResponse(projectServiceImpl.queryBySeq(sequenceNbr));
} }
......
...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.ugp.biz.service.impl; ...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum; import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
import com.yeejoin.amos.boot.module.ugp.api.entity.Company; import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
...@@ -62,24 +63,12 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company ...@@ -62,24 +63,12 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
/** /**
* 分页查询+筛选 * 分页查询+筛选
*/ */
public Page<CompanyDto> queryCompanyPage(int current, int size, Company company) { @Override
Page<CompanyDto> page = new Page<>(); public IPage<CompanyDto> queryCompanyPage(int current, int size, Company company) {
IPage<CompanyDto> page = new Page<>();
page.setSize(size); page.setSize(size);
page.setCurrent(current); page.setCurrent(current);
return companyMapper.queryCompanyPage(page,company);
this.list();
List<CompanyDto> companies = companyMapper.queryCompanyPage(company);
// List<CompanyDto> companyDtos = new ArrayList<>();
// BeanUtils.copyProperties(companies,companyDtos);
page.setRecords(companies);
// if (companyDto.getName() != null) {
// List<CompanyDto> collect = page1.getRecords().stream().filter(a -> a.getName().equals(companyDto.getName())).collect(Collectors.toList());
// page1.setRecords(collect);
// }
return page;
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment