feat: 选择企标计划带出数据接口

This commit is contained in:
2023-10-12 18:30:00 +08:00
parent 7b451c9d8b
commit c457a91c50
3 changed files with 26 additions and 0 deletions
@@ -6,6 +6,7 @@ import com.jero.common.aspect.annotation.AutoLog;
import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange;
import com.jero.modules.activiti.process.esInitChange.service.ProcessEsInitChangeService;
import com.jero.modules.laws.common.constant.FieldCommon;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService;
import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -32,6 +33,9 @@ public class ProcessESInitChangeController {
@Resource
private EnterpriseStandardUtil esUtil;
@Resource
private EnterpriseStandardPlanService espService;
/**
* 生成企标编号并返回
* @param esInitChange
@@ -122,4 +126,16 @@ public class ProcessESInitChangeController {
initChangeService.transfer(taskId, userId);
return Result.OK();
}
/**
* 选择企标编号带出数据
*
* @param espId
*/
@AutoLog(value = "企标立项变更流程-选择企标编号带出数据")
@ApiOperation(value="企标立项变更流程-选择企标编号带出数据", notes="企标立项变更流程-选择企标编号带出数据")
@PostMapping(value = "/getESPInfo")
public Result<?> getESPInfo(@RequestParam("id") String espId) {
return Result.OK(espService.getDetailById(espId));
}
}
@@ -156,9 +156,17 @@ public class EnterpriseStandardPlan implements Serializable {
@ApiModelProperty(value = "主起草人")
private String mainDraftingUser;
@ApiModelProperty(value = "主起草人Id")
@TableField(exist = false)
private String mainDraftingUserId;
@ApiModelProperty(value = "主起草单位")
private String mainDraftingUnit;
@ApiModelProperty(value = "主起草单位Id")
@TableField(exist = false)
private String mainDraftingUnitId;
@ApiModelProperty(value = "主起草单位责任人")
private String mainDraftingUnitResponsiblePerson;
@@ -218,7 +218,9 @@
p.compilation_description,
o1.file_name AS compilationFileName,
p.component_name,
u1.id as mainDraftingUserId,
u1.username as mainDraftingUser,
d.id as mainDraftingUnitId,
d.depart_name as mainDraftingUnit,
u2.username as mainDraftingUnitResponsiblePerson,
u3.username as promoter,