diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntDevice.java b/inventory-dao/src/main/java/com/rzyc/model/EntDevice.java index ef68914..dd306b3 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntDevice.java +++ b/inventory-dao/src/main/java/com/rzyc/model/EntDevice.java @@ -7,6 +7,7 @@ import java.util.Date; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; import java.io.Serializable; +import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -17,7 +18,7 @@ import io.swagger.annotations.ApiModelProperty; * 设备 *

* - * @author + * @author * @since 2022-10-18 */ @TableName("ent_device") @@ -166,6 +167,18 @@ public class EntDevice implements Serializable { @TableField(exist = false) private Integer inspectionCycle; + @ApiModelProperty("文件") + @TableField(exist = false) + private List sysdocumentList; + + public List getSysdocumentList() { + return sysdocumentList; + } + + public void setSysdocumentList(List sysdocumentList) { + this.sysdocumentList = sysdocumentList; + } + public Integer getInspectionCycle() { return inspectionCycle; } diff --git a/inventory-dao/src/main/resources/mapper/EntDeviceMapper.xml b/inventory-dao/src/main/resources/mapper/EntDeviceMapper.xml index 07f77cd..8cc9dca 100644 --- a/inventory-dao/src/main/resources/mapper/EntDeviceMapper.xml +++ b/inventory-dao/src/main/resources/mapper/EntDeviceMapper.xml @@ -58,11 +58,26 @@ + + + + + + + + + + + @@ -117,11 +132,11 @@ - + - - + + diff --git a/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java b/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java index fafe4f0..b361132 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java @@ -2186,7 +2186,6 @@ public class MinWorkController extends BaseController{ SysUser sysUser = super.getUser(userId); sysEnterprise.setCreatedby(sysUser.getChinaname()); sysEnterprise.setModifiedby(sysUser.getChinaname()); - int result = 0; if (null == sysEnterpriseDo.getSysenterpriseid()){ SysEnterprise verifyEnterprise = sysEnterpriseMapper.selectByName(sysEnterpriseDo.getEntname(),null); if (null != verifyEnterprise){ @@ -2253,14 +2252,6 @@ public class MinWorkController extends BaseController{ saveEntWork(sysEnterprise.getSysenterpriseid()); - - if (result > 0){ - singleResult.setMessage(Message.SUCCESS); - singleResult.setCode(Code.SUCCESS.getCode()); - }else { - singleResult.setMessage(Message.ERROR); - singleResult.setCode(Code.ERROR.getCode()); - } return singleResult; }