ganzi/ganzi-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增企业和企业社保图片显示

Browse Source
This commit is contained in:
mythxb 2023-05-19 13:57:47 +08:00
parent 3274fd1f8f
commit 460a1a07b6
3 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
inventory-dao/src/main/java/com/rzyc/model/EntDevice.java
View File

@ -7,6 +7,7 @@ import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
@ -166,6 +167,18 @@ public class EntDevice implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private Integer inspectionCycle; private Integer inspectionCycle;
@ApiModelProperty("文件")
@TableField(exist = false)
private List<Sysdocument> sysdocumentList;
public List<Sysdocument> getSysdocumentList() {
return sysdocumentList;
}
public void setSysdocumentList(List<Sysdocument> sysdocumentList) {
this.sysdocumentList = sysdocumentList;
}
public Integer getInspectionCycle() { public Integer getInspectionCycle() {
return inspectionCycle; return inspectionCycle;
} }

25
inventory-dao/src/main/resources/mapper/EntDeviceMapper.xml
View File

@ -58,11 +58,26 @@
<result column="modify_by" property="modifyBy" /> <result column="modify_by" property="modifyBy" />
<result column="frequency" property="frequency" /> <result column="frequency" property="frequency" />
<result column="recordNumber" property="recordNumber" /> <result column="recordNumber" property="recordNumber" />
<collection property="sysdocumentList" ofType="com.rzyc.model.Sysdocument" column="SysDocumentId">
<result column="SysDocumentId" jdbcType="VARCHAR" property="sysDocumentId" />
<result column="BizFileName" jdbcType="VARCHAR" property="bizFileName" />
<result column="SortId" jdbcType="INTEGER" property="sortId" />
<result column="RealFileName" jdbcType="VARCHAR" property="realFileName" />
<result column="FilePath" jdbcType="VARCHAR" property="filePath" />
<result column="FileType" jdbcType="VARCHAR" property="fileType" />
<result column="FileSize" jdbcType="VARCHAR" property="fileSize" />
<result column="OTCId" jdbcType="VARCHAR" property="OTCId" />
<result column="OTCType" jdbcType="VARCHAR" property="OTCType" />
</collection>
</resultMap> </resultMap>
<select id="selectEntEquipmentOverdue" resultMap="entEquipmentOverdueMap"> <select id="selectEntEquipmentOverdue" resultMap="entEquipmentOverdueMap">
select ed.*,cycle.frequency,cycle.recordNumber from ent_device ed select ed.*,cycle.frequency,cycle.recordNumber,sd.*
left join (select edic.device_id,edic.frequency,count(eir.ins_record_id)as recordNumber from ent_device_ins_cycle edic from ent_device ed
left join sysdocument sd on ed.device_id = sd.OTCId
left join (select edic.device_id,edic.frequency,
count(eir.ins_record_id)as recordNumber
from ent_device_ins_cycle edic
left join ent_ins_record eir on edic.inspection_id = eir.cycle_id)as cycle on ed.device_id = cycle.device_id left join ent_ins_record eir on edic.inspection_id = eir.cycle_id)as cycle on ed.device_id = cycle.device_id
where ed.enterprise_id = #{enterpriseId} and overdue_inspection = 2 where ed.enterprise_id = #{enterpriseId} and overdue_inspection = 2
</select> </select>
@ -117,11 +132,11 @@
<result column="model_state" property="state" /> <result column="model_state" property="state" />
<result column="countRecord" property="countRecord"/> <result column="countRecord" property="countRecord"/>
<collection property="sysdocumentList" ofType="com.rzyc.model.Sysdocument" column="SysDocumentId"> <collection property="sysdocumentList" ofType="com.rzyc.model.Sysdocument" column="SysDocumentId">
<result column="SysDocumentId" jdbcType="VARCHAR" property="SysDocumentId" /> <result column="SysDocumentId" jdbcType="VARCHAR" property="sysDocumentId" />
<result column="BizFileName" jdbcType="VARCHAR" property="bizFileName" /> <result column="BizFileName" jdbcType="VARCHAR" property="bizFileName" />
<result column="SortId" jdbcType="INTEGER" property="sortId" /> <result column="SortId" jdbcType="INTEGER" property="sortId" />
<result column="RealFileName" jdbcType="VARCHAR" property="RealFileName" /> <result column="RealFileName" jdbcType="VARCHAR" property="realFileName" />
<result column="FilePath" jdbcType="VARCHAR" property="FilePath" /> <result column="FilePath" jdbcType="VARCHAR" property="filePath" />
<result column="FileType" jdbcType="VARCHAR" property="fileType" /> <result column="FileType" jdbcType="VARCHAR" property="fileType" />
<result column="FileSize" jdbcType="VARCHAR" property="fileSize" /> <result column="FileSize" jdbcType="VARCHAR" property="fileSize" />
<result column="OTCId" jdbcType="VARCHAR" property="OTCId" /> <result column="OTCId" jdbcType="VARCHAR" property="OTCId" />

9
inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java
View File

@ -2186,7 +2186,6 @@ public class MinWorkController extends BaseController{
SysUser sysUser = super.getUser(userId); SysUser sysUser = super.getUser(userId);
sysEnterprise.setCreatedby(sysUser.getChinaname()); sysEnterprise.setCreatedby(sysUser.getChinaname());
sysEnterprise.setModifiedby(sysUser.getChinaname()); sysEnterprise.setModifiedby(sysUser.getChinaname());
int result = 0;
if (null == sysEnterpriseDo.getSysenterpriseid()){ if (null == sysEnterpriseDo.getSysenterpriseid()){
SysEnterprise verifyEnterprise = sysEnterpriseMapper.selectByName(sysEnterpriseDo.getEntname(),null); SysEnterprise verifyEnterprise = sysEnterpriseMapper.selectByName(sysEnterpriseDo.getEntname(),null);
if (null != verifyEnterprise){ if (null != verifyEnterprise){
@ -2253,14 +2252,6 @@ public class MinWorkController extends BaseController{
saveEntWork(sysEnterprise.getSysenterpriseid()); 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; return singleResult;
} }