Niko
/
shuili_manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

建管bug修改

dev_kxc
zhuyulei 1 year ago
parent
2c7b1ed8de
commit
f350d4630f
5 changed files with 101 additions and 31 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. 124
      jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java
  2. 2
      jwtech-system/src/main/java/com/kms/earlyStage/domain/PlanImpleInfo.java
  3. 2
      jwtech-system/src/main/java/com/kms/earlyStage/domain/ProjectBidNotice.java
  4. 2
      jwtech-system/src/main/java/com/kms/earlyStage/domain/ProjectBidResult.java
  5. 2
      jwtech-system/src/main/java/com/kms/earlyStage/domain/ProjectBidWinner.java

124
jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java
View File

@ -4,7 +4,9 @@ import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.jianwei.common.core.controller.BaseController;
import com.jianwei.common.core.domain.SearchParam;
import com.jianwei.common.core.domain.entity.SysDept;
@ -14,8 +16,8 @@ import com.kms.common.utils.BaseEntityUtils;
import com.kms.common.utils.UserUtils;
import com.kms.earlyStage.domain.SpecialProjectInfo;
import com.kms.earlyStage.service.SpecialProjectInfoService;
import com.kms.earlyStage.domain.*;
import com.kms.earlyStage.service.*;
import com.kms.system.domain.SysXzqh;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
@ -47,10 +49,26 @@ import com.jianwei.common.enums.BusinessType;
@RestController
@RequestMapping("/earlyStage/projectInfo")
@Api(tags = "专题项目前期背景信息")
public class SpecialProjectInfoController extends BaseController
{
public class SpecialProjectInfoController extends BaseController {
@Autowired
private SpecialProjectInfoService specialProjectInfoService;
//计划信息
@Autowired
private SpecialProjectPlanInfoService specialProjectPlanInfoService;
//建议书
@Autowired
private SpecialProjectProposalService specialProjectProposalService;
//初步设计
@Autowired
private SpecialProjectPreDesignService specialProjectPreDesignService;
//可行性
@Autowired
private SpecialProjectFeasibilityService specialProjectFeasibilityService;
//计划基本信息
@Autowired
private SpecialProjectBidInfoService specialProjectBidInfoService;
@Autowired
private SysDeptService sysDeptService;
@ -63,8 +81,7 @@ public class SpecialProjectInfoController extends BaseController
*/
@PostMapping("/list")
@ApiOperation("专题项目前期背景信息列表")
public IPage list(@RequestBody SearchParam<SpecialProjectInfo> sp)
{
public IPage list(@RequestBody SearchParam<SpecialProjectInfo> sp) {
SpecialProjectInfo projectInfo = sp.getData();
String adcd = null;
@ -85,15 +102,15 @@ public class SpecialProjectInfoController extends BaseController
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
infoAdcd = xzqh.getXzqhdm().substring(0, 4);
}else {
} else {
infoAdcd = xzqh.getXzqhdm();
}
return specialProjectInfoService.selectPage(sp,infoAdcd);
}else {
return specialProjectInfoService.selectPage(sp,null);
return specialProjectInfoService.selectPage(sp, infoAdcd);
} else {
return specialProjectInfoService.selectPage(sp, null);
}
}else if (adcd == null) {
} else if (adcd == null) {
SysUser user = UserUtils.getUser();
String deptId = user.getDeptId();
SysDept sysDept = sysDeptService.get(deptId);
@ -106,12 +123,12 @@ public class SpecialProjectInfoController extends BaseController
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
substring = xzqh.getXzqhdm().substring(0, 4);
}else {
} else {
substring = xzqh.getXzqhdm();
}
return specialProjectInfoService.selectPage(sp,substring);
}else {
return specialProjectInfoService.selectPage(sp, substring);
} else {
QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
sysXzqhQueryWrapper.eq("XZQHDM", adcd);
@ -123,7 +140,7 @@ public class SpecialProjectInfoController extends BaseController
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
adcd = xzqh.getXzqhdm().substring(0, 4);
}else {
} else {
adcd = xzqh.getXzqhdm();
}
return specialProjectInfoService.selectPage(sp, adcd);
@ -137,8 +154,7 @@ public class SpecialProjectInfoController extends BaseController
@Log(title = "专题项目前期背景信息导出", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ApiOperation("专题项目前期背景信息导出")
public AjaxResult export(@RequestBody SpecialProjectInfo specialProjectInfo)
{
public AjaxResult export(@RequestBody SpecialProjectInfo specialProjectInfo) {
List<SpecialProjectInfo> list = specialProjectInfoService.listByIds(specialProjectInfo.getIds());
ExcelUtil<SpecialProjectInfo> util = new ExcelUtil<>(SpecialProjectInfo.class);
return util.exportExcel(list, "projectinfo");
@ -149,8 +165,7 @@ public class SpecialProjectInfoController extends BaseController
*/
@ApiOperation(" 专题项目前期背景信息详情")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id)
{
public AjaxResult getInfo(@PathVariable("id") String id) {
return AjaxResult.success(specialProjectInfoService.getById(id));
}
@ -160,8 +175,7 @@ public class SpecialProjectInfoController extends BaseController
@Log(title = "专题项目前期背景信息新增", businessType = BusinessType.INSERT)
@PostMapping
@ApiOperation("专题项目前期背景信息新增")
public AjaxResult add(@RequestBody SpecialProjectInfo specialProjectInfo)
{
public AjaxResult add(@RequestBody SpecialProjectInfo specialProjectInfo) {
BaseEntityUtils.preInsert(specialProjectInfo);
String adcd = specialProjectInfo.getAdcd();
if (adcd == null) {
@ -180,19 +194,75 @@ public class SpecialProjectInfoController extends BaseController
@ApiOperation("专题项目前期背景信息修改")
@Log(title = "专题项目前期背景信息修改", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SpecialProjectInfo specialProjectInfo)
{
return toAjax(specialProjectInfoService.updateById(specialProjectInfo));
public AjaxResult edit(@RequestBody SpecialProjectInfo specialProjectInfo) {
String proNo = specialProjectInfo.getProNo();
String id = specialProjectInfo.getId();
//原来的
SpecialProjectInfo byId = specialProjectInfoService.getById(id);
String projectName = byId.getProjectName();
String adcd = byId.getAdcd();
if (projectName.equals(specialProjectInfo.getProjectName()) && adcd.equals(specialProjectInfo.getAdcd())) {
return toAjax(specialProjectInfoService.updateById(specialProjectInfo));
} else {
LambdaQueryWrapper<SpecialProjectPlanInfo> lambdaQuery = Wrappers.lambdaQuery(SpecialProjectPlanInfo.class);
lambdaQuery.eq(SpecialProjectPlanInfo::getProNo, proNo);
List<SpecialProjectPlanInfo> list = specialProjectPlanInfoService.list(lambdaQuery);
if (list.size() > 0) {
for (SpecialProjectPlanInfo specialProjectPlanInfo : list) {
specialProjectPlanInfo.setRelatedProjects(specialProjectInfo.getProjectName());
specialProjectPlanInfo.setAdcd(specialProjectInfo.getAdcd());
specialProjectPlanInfoService.updateById(specialProjectPlanInfo);
}
}
LambdaQueryWrapper<SpecialProjectProposal> wrapper = Wrappers.lambdaQuery(SpecialProjectProposal.class);
wrapper.eq(SpecialProjectProposal::getProNo, proNo);
List<SpecialProjectProposal> list1 = specialProjectProposalService.list(wrapper);
if (list1.size() > 0) {
for (SpecialProjectProposal specialProjectProposal : list1) {
specialProjectProposal.setProjectName(specialProjectInfo.getProjectName());
specialProjectProposal.setAdcd(specialProjectInfo.getAdcd());
specialProjectProposalService.updateById(specialProjectProposal);
}
}
LambdaQueryWrapper<SpecialProjectPreDesign> wrapper1 = Wrappers.lambdaQuery(SpecialProjectPreDesign.class);
wrapper1.eq(SpecialProjectPreDesign::getProNo, proNo);
wrapper1.eq(SpecialProjectPreDesign::getProNo, proNo);
List<SpecialProjectPreDesign> list2 = specialProjectPreDesignService.list(wrapper1);
if (list2.size() > 0) {
for (SpecialProjectPreDesign specialProjectPreDesign : list2) {
specialProjectPreDesign.setProjectName(specialProjectInfo.getProjectName());
specialProjectPreDesign.setAdcd(specialProjectInfo.getAdcd());
specialProjectPreDesignService.updateById(specialProjectPreDesign);
}
}
LambdaQueryWrapper<SpecialProjectFeasibility> query = Wrappers.lambdaQuery(SpecialProjectFeasibility.class);
query.eq(SpecialProjectFeasibility::getProNo, proNo);
query.eq(SpecialProjectFeasibility::getProNo, proNo);
List<SpecialProjectFeasibility> list3 = specialProjectFeasibilityService.list(query);
if (list3.size() > 0) {
for (SpecialProjectFeasibility specialProjectFeasibility : list3) {
specialProjectFeasibility.setProjectName(specialProjectInfo.getProjectName());
specialProjectFeasibility.setAdcd(specialProjectInfo.getAdcd());
specialProjectFeasibilityService.updateById(specialProjectFeasibility);
}
}
return toAjax(specialProjectInfoService.updateById(specialProjectInfo));
}
}
/**
* 删除专题项目前期背景信息
*/
@ApiOperation("专题项目前期背景信息删除")
@Log(title = "专题项目前期背景信息删除", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids)
{
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) {
return toAjax(specialProjectInfoService.removeByIds(Arrays.asList(ids)));
}
}

2
jwtech-system/src/main/java/com/kms/earlyStage/domain/PlanImpleInfo.java
View File

@ -97,7 +97,7 @@ public class PlanImpleInfo extends BaseEntity
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "完成计划结束时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("完成计划结束时间")
@TableField("End_TIME")
@TableField("END_TIME")
private Date completeTime;
/** 完成计划投资使用进度安排 */

2
jwtech-system/src/main/java/com/kms/earlyStage/domain/ProjectBidNotice.java
View File

@ -85,7 +85,7 @@ public class ProjectBidNotice extends BaseEntity
/** 工期（交货期） */
@Excel(name = "工期", readConverterExp = "交=货期")
@ApiModelProperty("工期")
private Date deliveryTime;
private String deliveryTime;
/** 最高投标限价 */
@Excel(name = "最高投标限价")

2
jwtech-system/src/main/java/com/kms/earlyStage/domain/ProjectBidResult.java
View File

@ -82,7 +82,7 @@ public class ProjectBidResult extends BaseEntity
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "工期", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("工期")
private Date deliveryTime;
private String deliveryTime;
/** 项目负责人 */
@Excel(name = "项目负责人")

2
jwtech-system/src/main/java/com/kms/earlyStage/domain/ProjectBidWinner.java
View File

@ -60,7 +60,7 @@ public class ProjectBidWinner extends BaseEntity
/** 工期（交货期） */
@Excel(name = "工期", readConverterExp = "交=货期")
@ApiModelProperty("工期")
private Date deliveryTime;
private String deliveryTime;
/** 中标候选人响应招标文件的资格能力条件 */
@Excel(name = "中标候选人响应招标文件的资格能力条件")

Write Preview
Loading…
Cancel
Save