From 40bdbf64c7b50af057cdc5ae7a923d65a5667863 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 5 Aug 2021 09:20:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=EF=BC=81=EF=BC=81=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_auth/LawsUserInfoService.java | 11 ++ .../SarInterpretationNationalStandard.java | 87 +++++++++++++ .../business_slrs/dao/SarStandItems.java | 123 ++++++++++++++++++ .../PEPDepartLeaderAfter.java | 4 +- .../standardRead/DeptApplayAfter.java | 37 +++++- 5 files changed, 259 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarInterpretationNationalStandard.java create mode 100644 src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarStandItems.java diff --git a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java index 7ec283eb..0c2a5740 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java @@ -4,7 +4,9 @@ import com.github.pagehelper.PageInfo; import com.tmsps.fk.common.wrapper.Wrapper; import com.ydw.bat.wkflow.business_main.datas.dto.*; import com.ydw.bat.wkflow.business_main.datas.entity.*; +import com.ydw.bat.wkflow.business_slrs.dao.SarInterpretationNationalStandard; import com.ydw.bat.wkflow.business_slrs.dao.SarPublicIdea; +import com.ydw.bat.wkflow.business_slrs.dao.SarStandItems; import feign.Headers; import org.apache.ibatis.annotations.Param; import org.springframework.cloud.openfeign.FeignClient; @@ -107,6 +109,15 @@ public interface LawsUserInfoService { + @PostMapping("/SarStandItems/sar-stand-items/saveBatch") + public String sarStandItemsSaveBatch(@RequestBody List sarStandItems); + + + @PostMapping("/sarStandardComplianceAssessResult/sar-interpretation-national-standard/saveBatch") + public String SarInterpretationNationalStandardSaveBatch(@RequestBody List standards); + + + } diff --git a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarInterpretationNationalStandard.java b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarInterpretationNationalStandard.java new file mode 100644 index 00000000..1a14368a --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarInterpretationNationalStandard.java @@ -0,0 +1,87 @@ +package com.ydw.bat.wkflow.business_slrs.dao; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.Date; + +/** + *

+ * + *

+ * + * @author zyl + * @since 2021-06-18 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="SarInterpretationNationalStandard对象", description="") +public class SarInterpretationNationalStandard { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "具体章条") + private String specificItem; + + @ApiModelProperty(value = "核心技术要求") + private String coreTechnicalRequirement; + + @ApiModelProperty(value = "相对于上一版本变化点") + private String comparedWithPrevious; + + @ApiModelProperty(value = "合规性分析") + private String complianceState; + + @ApiModelProperty(value = "上一版本号") + @TableField("LAST_VERSION_NUMBER") + private String lastVersionNumber; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATION_TIME") + private Date creationTime; + + @ApiModelProperty(value = "修改时间") + @TableField("MODIFY_TIME") + private Date modifyTime; + + @ApiModelProperty(value = "标准ID") + @TableField("STAND_ID") + private String standId; + + @ApiModelProperty(value = "标准分类") + @TableField("STAND_TYPE") + private String standType; + + @ApiModelProperty(value = "标准类别") + @TableField("STAND_SORT") + private String standSort; + + @ApiModelProperty(value = "标准编号") + @TableField("STAND_NUMBER") + private String standNumber; + + @ApiModelProperty(value = "标准名称") + @TableField("STAND_NAME") + private String standName; + + @TableField("CREATION_USER") + private String creationUser; + + @ApiModelProperty(value = "是否有效") + @TableField("VALID_FLAG") + private String validFlag; + + @ApiModelProperty(value = "评估状态") + @TableField("INTERPRETATION_STATE") + private String interpretationState; + + @ApiModelProperty(value = "评估时间") + @TableField("INTERPRETATION_TIME") + private Date interpretationTime; + + +} diff --git a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarStandItems.java b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarStandItems.java new file mode 100644 index 00000000..0fcd2322 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarStandItems.java @@ -0,0 +1,123 @@ +package com.ydw.bat.wkflow.business_slrs.dao; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.Date; +import java.util.List; + +/** + *

+ * + *

+ * + * @author super_liu + * @since 2021-06-01 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="SarStandItems对象", description="") +public class SarStandItems { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + @TableId("ID") + private String id; + + @ApiModelProperty(value = "标准ID") + @TableField("STAND_ID") + private String standId; + + @ApiModelProperty(value = "条目编号") + @TableField("ITEMS_NUM") + private String itemsNum; + + @ApiModelProperty(value = "条目内容") + @TableField("ITEMS_NAME") + private String itemsName; + + @ApiModelProperty(value = "涉及零部件") + @TableField("PARTS") + private String parts; + + @ApiModelProperty(value = "特殊生效时间") + @TableField("TACK_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date tackTime; + + @ApiModelProperty(value = "适用车型") + @TableField("APPLY_ARCTIC") + private String applyArctic; + + @ApiModelProperty(value = "能源类型") + @TableField("ENERGY_KIND") + private String energyKind; + + @ApiModelProperty(value = "责任部门") + @TableField("RESPONSIBLE_UNIT") + private String responsibleUnit; + + @ApiModelProperty(value = "备注") + @TableField("REMARKS") + private String remarks; + + @ApiModelProperty(value = "是否有效") + @TableField("VALID_FLAG") + private Integer validFlag; + + @TableField("CREATION_USER") + private String creationUser; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATION_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + + @ApiModelProperty(value = "修改时间") + @TableField("MODIFY_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + + @ApiModelProperty(value = "条款要求") + @TableField("TERMS_CONDITIONS") + private String termsConditions; + + @ApiModelProperty(value = "实施要点") + @TableField("MAINPOINTS_IMPEMENTATION") + private String mainpointsImpementation; + + @ApiModelProperty(value = "FO") + @TableField("FO") + private String fo; + + @ApiModelProperty(value = "责任工程师") + @TableField("DUTY_ENGINEER") + private String dutyEngineer; + + @ApiModelProperty(value = "SVPPS") + @TableField("SVPPS") + private String svpps; + + @ApiModelProperty(value = "要求类型") + @TableField("CLAIM_TYPE") + private String claimType; + + @ApiModelProperty(value = "企标覆盖关系") + @TableField("BUS_STAND_COVER") + private String busStandCover; + + @ApiModelProperty(value = "文件类型") + @TableField("FILE_TYPE") + private String fileType; + + + + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java index 532a1642..d46d6ec4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java @@ -63,7 +63,7 @@ public class PEPDepartLeaderAfter implements TaskListener { if (null!=object1.getString("noCompliance")) { SarStandUnqualified sarStandUnqualified = new SarStandUnqualified(); //少一个standId 不合格原因 在研在产！ - sarStandUnqualified.setStandId(o.getStandNumber()); + sarStandUnqualified.setStandId(o.getStandId()); sarStandUnqualified.setStandName(o.getStandName()); sarStandUnqualified.setItemsNum(o.getItemNum()); sarStandUnqualified.setCreateById(delegateTask.getVariable("prcCreateUser", String.class)); @@ -85,7 +85,7 @@ public class PEPDepartLeaderAfter implements TaskListener { if (null!=object1.getString("zcNoCompliance")) { SarStandUnqualified sarStandUnqualified = new SarStandUnqualified(); //少一个standId 不合格原因 在研在产！ - sarStandUnqualified.setStandId(o.getStandNumber()); + sarStandUnqualified.setStandId(o.getStandId()); sarStandUnqualified.setStandName(o.getStandName()); sarStandUnqualified.setItemsNum(o.getItemNum()); sarStandUnqualified.setCreateById(delegateTask.getVariable("prcCreateUser", String.class)); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java index 97eea31d..8fd72a4c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java @@ -1,14 +1,19 @@ package com.ydw.bat.wkflow.listener.standardRead; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.business_slrs.dao.SarInterpretationNationalStandard; +import com.ydw.bat.wkflow.business_slrs.dao.SarStandItems; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; @@ -27,7 +32,7 @@ public class DeptApplayAfter implements TaskListener{ IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - + LawsUserInfoService lawsUserInfoService=SpringContextUtil.getBean(LawsUserInfoService.class); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); Datas datas = datasService.getOne(queryWrapper); @@ -39,6 +44,35 @@ public class DeptApplayAfter implements TaskListener{ //部长进行审批（1：通过） if (object.getString("gcApplyFlag").equals("1")) { delegateTask.setVariable("bzFlag", 1); + JSONArray jsonArray=JSONArray.parseArray(object.getString("itemList")); + List sarStandItems=new ArrayList<>(); + List standards=new ArrayList<>(); + jsonArray.forEach(o -> { + JSONObject os=JSONObject.parseObject(o.toString()); + //分解单数据 + SarStandItems sarStandItems1=new SarStandItems(); + sarStandItems1.setFileType("FBGBJBD"); + sarStandItems1.setStandId(object.getString("standId")); + sarStandItems1.setItemsNum(os.getString("itemsNum")); + sarStandItems1.setItemsName(object.getString("itemsName")); + sarStandItems1.setResponsibleUnit(object.getString("responsibleUnitShow")); + sarStandItems1.setDutyEngineer(object.getString("zxUserId")); + sarStandItems1.setApplyArctic(object.getString("applyArctic")); + sarStandItems1.setTermsConditions(object.getString("itermsConditions")); + sarStandItems.add(sarStandItems1); + //结果数据 + SarInterpretationNationalStandard standard=new SarInterpretationNationalStandard(); + standard.setStandId(sarStandItems1.getStandId()); + standard.setStandSort("");//GB 需要前端传 + standard.setStandName(object.getString("itemsName")); + standard.setComparedWithPrevious(os.getString("changePoint")); + standard.setCoreTechnicalRequirement(os.getString("technicalRequir")); + standard.setComplianceState(object.getString("complianceState")); + standard.setCreationTime(object.getDate("creationTime")); + standards.add(standard); + }); + lawsUserInfoService.sarStandItemsSaveBatch(sarStandItems); + lawsUserInfoService.SarInterpretationNationalStandardSaveBatch(standards); } else { delegateTask.setVariable("bzFlag", 2); } @@ -93,5 +127,6 @@ public class DeptApplayAfter implements TaskListener{ busBean.saveOrUpdate(one2); } } + throw new ActivitiException("最后一步啦啦啦啦啦啦啦啦啦"); } }