Commit 1c00e673 authored by chenzhao's avatar chenzhao

报检 增加人员内部代码赋值

parent 6d438185
...@@ -113,6 +113,12 @@ public class JyjcInspectionApplication extends BaseEntity { ...@@ -113,6 +113,12 @@ public class JyjcInspectionApplication extends BaseEntity {
@TableField("application_unit_code") @TableField("application_unit_code")
private String applicationUnitCode; private String applicationUnitCode;
/**
* 内部人员代码
* */
@TableField("inner_person_code")
private String innerPersonCode;
/** /**
* 包含设备数量(冗余) * 包含设备数量(冗余)
*/ */
......
...@@ -111,40 +111,43 @@ public class JyjcInspectionApplicationModel extends BaseModel { ...@@ -111,40 +111,43 @@ public class JyjcInspectionApplicationModel extends BaseModel {
@ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存") @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
private String workflowNode; private String workflowNode;
@ApiModelProperty(value = "告知书") @ApiModelProperty(value = "内部人员代码")
private List<Map<String,Object>> gzs; private String innerPersonCode;
@ApiModelProperty(value = "产品质量证明书")
private List<Map<String,Object>> cpzl; @ApiModelProperty(value = "告知书")
@ApiModelProperty(value = "施工自行检查报告") private List<Map<String, Object>> gzs;
private List<Map<String,Object>> sgzxbg ; @ApiModelProperty(value = "产品质量证明书")
@ApiModelProperty(value = "施工合同或证明") private List<Map<String, Object>> cpzl;
private List<Map<String,Object>> sght; @ApiModelProperty(value = "施工自行检查报告")
@ApiModelProperty(value = "施工方案/施工设计文件") private List<Map<String, Object>> sgzxbg;
private List<Map<String,Object>> sgfa; @ApiModelProperty(value = "施工合同或证明")
@ApiModelProperty(value = "施工单位许可证书") private List<Map<String, Object>> sght;
private List<Map<String,Object>> sgdwxk; @ApiModelProperty(value = "施工方案/施工设计文件")
@ApiModelProperty(value = "型式试验证书") private List<Map<String, Object>> sgfa;
private List<Map<String,Object>> xssy; @ApiModelProperty(value = "施工单位许可证书")
@ApiModelProperty(value = "限速器和渐进式安全钳的调试证书") private List<Map<String, Object>> sgdwxk;
private List<Map<String,Object>> xsqts; @ApiModelProperty(value = "型式试验证书")
@ApiModelProperty(value = "土建声明") private List<Map<String, Object>> xssy;
private List<Map<String,Object>> tjsm; @ApiModelProperty(value = "限速器和渐进式安全钳的调试证书")
@ApiModelProperty(value = "质量保证手册和程序文件") private List<Map<String, Object>> xsqts;
private List<Map<String,Object>> zlbz; @ApiModelProperty(value = "土建声明")
@ApiModelProperty(value = "施工作业文件") private List<Map<String, Object>> tjsm;
private List<Map<String,Object>> sgzy; @ApiModelProperty(value = "质量保证手册和程序文件")
@ApiModelProperty(value = "施工人员、质量保证体系责任人、专业技术人员身份证、技术工人的身份证及资质证书") private List<Map<String, Object>> zlbz;
private List<Map<String,Object>> sgry; @ApiModelProperty(value = "施工作业文件")
@ApiModelProperty(value = "产品技术文件") private List<Map<String, Object>> sgzy;
private List<Map<String,Object>> cpjs; @ApiModelProperty(value = "施工人员、质量保证体系责任人、专业技术人员身份证、技术工人的身份证及资质证书")
@ApiModelProperty(value = "施工设计文件") private List<Map<String, Object>> sgry;
private List<Map<String,Object>> sgsj; @ApiModelProperty(value = "产品技术文件")
@ApiModelProperty(value = "施工分包方目录") private List<Map<String, Object>> cpjs;
private List<Map<String,Object>> sgfb; @ApiModelProperty(value = "施工设计文件")
@ApiModelProperty(value = "分包方评价资料") private List<Map<String, Object>> sgsj;
private List<Map<String,Object>> fbspj; @ApiModelProperty(value = "施工分包方目录")
@ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存") private List<Map<String, Object>> sgfb;
private List<Map<String,Object>> equip; @ApiModelProperty(value = "分包方评价资料")
private List<Map<String, Object>> fbspj;
@ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
private List<Map<String, Object>> equip;
@ApiModelProperty("检验结果方式") @ApiModelProperty("检验结果方式")
private String resultType; private String resultType;
......
...@@ -70,9 +70,14 @@ public class CommonController extends BaseController { ...@@ -70,9 +70,14 @@ public class CommonController extends BaseController {
return null; return null;
} }
List<String> phones = userPhones.stream().map(TzsUserInfo::getInnerPersonCode).collect(Collectors.toList()); List<String> phones = userPhones.stream().map(TzsUserInfo::getInnerPersonCode).collect(Collectors.toList());
String innerPersonCode = String.join(",", phones);
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
map.put("innerPersonCode",innerPersonCode); if (CollectionUtils.isEmpty(phones)){
String innerPersonCode = String.join(",", phones);
map.put("innerPersonCode",innerPersonCode);
}else {
map.put("innerPersonCode","");
}
return ResponseHelper.buildResponse(map); return ResponseHelper.buildResponse(map);
} }
......
...@@ -512,6 +512,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -512,6 +512,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
//逻辑变更为 通过后才对办理时间赋值 //逻辑变更为 通过后才对办理时间赋值
if (status.equals(FlowStatusEnum.TO_BE_FINISHED.getCode())){ if (status.equals(FlowStatusEnum.TO_BE_FINISHED.getCode())){
entity.setAcceptDate(new Date()); entity.setAcceptDate(new Date());
entity.setInspectionUnitCode(params.getOrDefault("innerPersonCode","").toString());
} }
this.updateById(entity); this.updateById(entity);
......
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