ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 企标稽查-延期稽查

Browse Source
This commit is contained in:
mzaxd
2023-09-13 14:05:57 +08:00
parent bde57df513
commit d875f7d235
8 changed files with 195 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java
+18
View File
@@ -7,8 +7,10 @@ import com.jero.common.system.base.controller.JeroController;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectDelay;
import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO;
import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectDelayService;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -36,6 +38,9 @@ public class EnterpriseStandardInspectController extends JeroController<Enterpri
@Resource
private EnterpriseStandardInspectService esInspectService;;
@Resource
private EnterpriseStandardInspectDelayService esInspectDelayService;
/**
* 分页列表查询
*
@@ -50,4 +55,17 @@ public class EnterpriseStandardInspectController extends JeroController<Enterpri
IPage<EnterpriseStandardInspectVo> pageList= esInspectService.queryPageList(esInspect, pageNo, pageSize);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK), pageList);
}
/**
* 延期稽查
*
* @return
*/
@AutoLog(value = "企标稽查-延期稽查")
@ApiOperation(value="企标稽查-延期稽查", notes="企标稽查-延期稽查")
@GetMapping(value = "/delayInspect")
public Result<?> delayInspect(@RequestParam("id") String inspectId) {
EnterpriseStandardInspectDelay esInspectDelay = esInspectDelayService.getLastDelayInspect(inspectId);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK), esInspectDelay);
}
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectDelay.java
+66
View File
@@ -0,0 +1,66 @@
package com.jero.modules.laws.enterprise.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
*
* @TableName laws_enterprise_standard_inspect_delay
*/
@TableName(value ="laws_enterprise_standard_inspect_delay")
@Data
public class EnterpriseStandardInspectDelay implements Serializable {
/**
* 主键ID
*/
@TableId
private String id;
/**
* 创建人
*/
private String createBy;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新人
*/
private String updateBy;
/**
* 更新时间
*/
private Date updateTime;
/**
* 所属部门
*/
private String orgCode;
/**
* 稽查id
*/
private String inspectId;
/**
* 申请延期日期
*/
private Date requestDelayDate;
/**
* 延期说明
*/
private String delayDescprtion;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java
+4
View File
@@ -72,4 +72,8 @@ public class EnterpriseStandardInspectVo {
@ApiModelProperty(value = "创建时间")
private Date createTime;
/** 延期稽查标识 */
@ApiModelProperty(value = "延期稽查标识")
private boolean delayFlag;
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectDelayMapper.java
+18
View File
@@ -0,0 +1,18 @@
package com.jero.modules.laws.enterprise.mapper;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectDelay;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author ThinkBook
* @description 针对表【laws_enterprise_standard_inspect_delay】的数据库操作Mapper
* @createDate 2023-09-13 13:46:35
* @Entity com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectDelay
*/
public interface EnterpriseStandardInspectDelayMapper extends BaseMapper<EnterpriseStandardInspectDelay> {
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectDelayMapper.xml
+24
View File
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectDelayMapper">
<resultMap id="BaseResultMap" type="com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectDelay">
<id property="id" column="id" jdbcType="VARCHAR"/>
<result property="createBy" column="create_by" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="orgCode" column="org_code" jdbcType="VARCHAR"/>
<result property="inspectId" column="inspect_id" jdbcType="VARCHAR"/>
<result property="requestDelayDate" column="request_delay_date" jdbcType="TIMESTAMP"/>
<result property="delayDescprtion" column="delay_descprtion" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
id,create_by,create_time,
update_by,update_time,org_code,
inspect_id,request_delay_date,delay_descprtion
</sql>
</mapper>
laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml
+8 -3
View File
@@ -25,6 +25,7 @@
<select id="page" resultType="com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo">
SELECT
DISTINCT
i.id,
s.standard_no AS inspectNo,
s.standard_name AS inspectName,
@@ -37,7 +38,11 @@
i.complete_date AS completeDate,
u3.username AS actualInspectUser,
i.inspect_status AS inspectStatus,
i.create_time AS createTime
i.create_time AS createTime,
CASE
WHEN id.id IS NOT NULL THEN TRUE
ELSE FALSE
END AS delayFlag
FROM
`laws_enterprise_standard_inspect` AS i
LEFT JOIN laws_working_group AS w ON w.id = i.standardization_work_group
@@ -46,6 +51,7 @@
LEFT JOIN sys_user AS u1 ON u1.id = i.inspect_user
LEFT JOIN sys_user AS u2 ON u2.id = i.standardization_docking_user
LEFT JOIN sys_user AS u3 ON u3.id = i.actual_inspect_user
LEFT JOIN laws_enterprise_standard_inspect_delay as id ON id.inspect_id = i.id
LEFT JOIN
(SELECT
io.inspect_id as id,
@@ -78,7 +84,6 @@
<if test="param.inspectCreateStartDate != null and param.inspectCreateEndDate != null">
AND i.create_time BETWEEN #{param.inspectCreateStartDate} AND #{param.inspectCreateEndDate}
</if>
ORDER BY
i.create_time DESC
ORDER BY i.create_time DESC
</select>
</mapper>
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectDelayService.java
+19
View File
@@ -0,0 +1,19 @@
package com.jero.modules.laws.enterprise.service;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectDelay;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @author ThinkBook
* @description 针对表【laws_enterprise_standard_inspect_delay】的数据库操作Service
* @createDate 2023-09-13 13:46:35
*/
public interface EnterpriseStandardInspectDelayService extends IService<EnterpriseStandardInspectDelay> {
/**
* 稽查列表获取最新的延期极差信息
* @param inspectId
* @return
*/
EnterpriseStandardInspectDelay getLastDelayInspect(String inspectId);
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectDelayServiceImpl.java
+38
View File
@@ -0,0 +1,38 @@
package com.jero.modules.laws.enterprise.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.exception.JeroBootException;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectDelay;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectDelayService;
import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectDelayMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* @author ThinkBook
* @description 针对表【laws_enterprise_standard_inspect_delay】的数据库操作Service实现
* @createDate 2023-09-13 13:46:35
*/
@Service
@Transactional(rollbackFor = JeroBootException.class)
@Slf4j
public class EnterpriseStandardInspectDelayServiceImpl extends ServiceImpl<EnterpriseStandardInspectDelayMapper, EnterpriseStandardInspectDelay>
implements EnterpriseStandardInspectDelayService{
@Override
public EnterpriseStandardInspectDelay getLastDelayInspect(String inspectId) {
// 多次延期只返回最新的信息
LambdaQueryWrapper<EnterpriseStandardInspectDelay> esInspectDelayWrapper = new LambdaQueryWrapper<>();
esInspectDelayWrapper.orderByDesc(EnterpriseStandardInspectDelay::getCreateTime);
List<EnterpriseStandardInspectDelay> list = list(esInspectDelayWrapper);
return list.get(0);
}
}