Commit 6c58a717 authored by zhangyingbin's avatar zhangyingbin

修改新增项目接口,新增添加项目code

parent 54ca8e90
...@@ -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.SimpleDateFormat;
import java.util.*; import java.util.*;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
...@@ -84,6 +85,7 @@ public class ProjectController extends BaseController { ...@@ -84,6 +85,7 @@ public class ProjectController extends BaseController {
model.setChargePerson(orgServiceImpl.getOrgUsrById(String.valueOf(model.getChargePersonId())).getBizOrgName()); model.setChargePerson(orgServiceImpl.getOrgUsrById(String.valueOf(model.getChargePersonId())).getBizOrgName());
model.setInstallRegion(map.get("regionName")); model.setInstallRegion(map.get("regionName"));
model.setInstallRegionCode(map.get("regionCode")); model.setInstallRegionCode(map.get("regionCode"));
model.setCode(getCode());
model = projectServiceImpl.createWithModel(model); model = projectServiceImpl.createWithModel(model);
Project project = new Project(); Project project = new Project();
BeanUtils.copyProperties(model, project); BeanUtils.copyProperties(model, project);
...@@ -91,6 +93,19 @@ public class ProjectController extends BaseController { ...@@ -91,6 +93,19 @@ public class ProjectController extends BaseController {
return ResponseHelper.buildResponse(model); return ResponseHelper.buildResponse(model);
} }
public String getCode(){
String date = new SimpleDateFormat("MMdd").format(new Date());
String code = "XM"+date+"-";
int c = 1;
LambdaQueryWrapper<Project> wrapper = new LambdaQueryWrapper<>();
wrapper.orderByDesc(Project::getCode);
String projectCode = projectServiceImpl.list(wrapper).iterator().next().getCode();
if(!ValidationUtil.isEmpty(projectCode)){
c = Integer.parseInt(projectCode.substring(projectCode.indexOf("-")+1,projectCode.length()))+1;
}
return code+c;
}
public Map<String,String> getInfo(String regionName,String regionCode,Long sequenceNbr){ public Map<String,String> getInfo(String regionName,String regionCode,Long sequenceNbr){
RegionModel region = Systemctl.regionClient.getRegion(sequenceNbr).getResult(); RegionModel region = Systemctl.regionClient.getRegion(sequenceNbr).getResult();
regionName = region.getRegionName() + regionName; regionName = region.getRegionName() + regionName;
......
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