소스 검색

条件变更

yue 5 년 전
부모
커밋
77e0edb678

+ 1 - 1
src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/utils/MyImportUtils.java

@@ -226,7 +226,7 @@ public class MyImportUtils {
             }else {
                 //设计变更
                 if (null!=construction.getDisclose().getInconsistentDescription()){//图纸现场不一致说明
-                    if ("不一致".equals(construction.getDisclose().getLineName())||//线路名称一致性
+                    if ("".equals(construction.getDisclose().getLineName())||//线路名称一致性
                             "否".equals(construction.getDisclose().getQuantities())||//工程量是否一致
                             !"".equals(construction.getDisclose().getImplementedContent())){//已实施内容描述不为空
                         model.addAttribute("pass_construction2","0");

+ 0 - 3
src/main/java/com/jeeplus/modules/sg/materialmodule/activiti/entity/MaterialModule.java

@@ -1,9 +1,6 @@
 package com.jeeplus.modules.sg.materialmodule.activiti.entity;
 
 import com.jeeplus.core.persistence.ActEntity;
-import io.swagger.models.auth.In;
-import sun.plugin.viewer.context.IExplorerAppletContext;
-
 import java.util.Date;
 
 public class MaterialModule extends ActEntity<MaterialModule> {