update 企标计划变更流程

laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/entity/ProcessAnnualInitLink.java

@@ -145,12 +145,6 @@ public class ProcessAnnualInitLink implements Serializable {
      */
     @ApiModelProperty(value = "所属部门")
     private String orgCode;
-    /**
-     * 删除状态(0-正常,1-删除)
-     */
-    @ApiModelProperty(value = "删除状态(0-正常,1-删除)")
-    @TableLogic
-    private Integer delFlag;
 
 
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java

@@ -192,9 +192,10 @@ public class ProcessAnnualInitLinkService extends ServiceImpl<ProcessAnnualInitL
                 excelVO.setRevisionType(espRevisionTypeMap.get(revisionType));
             }
             String standardNumber = excelVO.getStandardNumber();
-            if (StringUtils.isBlank(standardNumber)){
+            if (ProcessAnnualInitCommon.REVISE.equals(revisionType)){
-                msgSub.append("第" + (i + 4) + "行" + "企标编号不能为空;");
+                if (StringUtils.isBlank(standardNumber)){
-            }else if (ProcessAnnualInitCommon.REVISE.equals(revisionType)){
+                    msgSub.append("第" + (i + 4) + "行" + "企标编号不能为空;");
+                }
                 LawsEnterpriseStandard lawsEnterpriseStandard = enterpriseStandardService.queryByStandardNumber(standardNumber);
                 if (lawsEnterpriseStandard != null){
                     excelVO.setStandardId(lawsEnterpriseStandard.getId());

laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/entity/ProcessPlanChangeLink.java

@@ -189,12 +189,6 @@ public class ProcessPlanChangeLink implements Serializable {
      */
     @ApiModelProperty(value = "所属部门")
     private String orgCode;
-    /**
-     * 删除状态(0-正常,1-删除)
-     */
-    @ApiModelProperty(value = "删除状态(0-正常,1-删除)")
-    @TableLogic
-    private Integer delFlag;
 
 
 }