FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_migration' into 'develop_master'

Browse Source 
feat: There is no way the, buss state

See merge request LiuChao/foton-slrs-system-rest!391
This commit is contained in:
super_liu
2022-01-24 20:08:42 +08:00
parent 46fd4ef86c 01a0a31d15
commit b992c47c94
7 changed files with 388 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/controller/SarBussionessStandStateController.java
+51
View File
@@ -0,0 +1,51 @@
package com.adc.da.slrs.sarBussionessStandState.controller;
import com.adc.da.http.PageInfo;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage;
import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService;
import com.adc.da.util.LoginUserUtil;
import com.adc.da.util.utils.StringUtils;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.adc.da.base.web.BaseController;
import java.util.List;
/**
* <p>
* 企业标准信息复审表 前端控制器
* </p>
*
* @author super_liu
* @since 2022-01-23
*/
@RestController
@Api(tags = "福田标准法规--企业复审信息")
@RequestMapping("/${restPath}/lawss/sarBussionessStandState")
public class SarBussionessStandStateController extends BaseController<SarBussionessStandState> {
@Autowired
private ISarBussionessStandStateService bussionessStandStateService;
/**
* 自定义分页查询列表
* @param page 标准信息
* @return
*/
@ApiOperation(value = "|SarBussionessStandState|自定义分页查询列表")
@GetMapping("/getSarBussionStandPage")
//@RequiresPermissions("lawss:sarBussionessStand:getSarBussionStandPage")
public ResponseMessage<PageInfo<SarBussionessStandState>> getSarBussionessStandStatePage(SarBussionessStandStatePage page) throws Exception {
List<SarBussionessStandState> rows = bussionessStandStateService.getSarBussionessStandStatePage(page);
return Result.success(getPageInfo(page.getPager(), rows));
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/dao/SarBussionessStandStateDao.java
+23
View File
@@ -0,0 +1,23 @@
package com.adc.da.slrs.sarBussionessStandState.dao;
import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState;
import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
/**
* <p>
* 企业标准信息复审表 Mapper 接口
* </p>
*
* @author super_liu
* @since 2022-01-23
*/
public interface SarBussionessStandStateDao extends BaseMapper<SarBussionessStandState> {
List<SarBussionessStandState> getBussionessStandStatePage(SarBussionessStandStatePage page);
int getBussionessStandStateCount(SarBussionessStandStatePage page);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java
+84
View File
@@ -0,0 +1,84 @@
package com.adc.da.slrs.sarBussionessStandState.entity;
import com.adc.da.base.entity.BaseEntity;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
* 企业标准信息复审表
* </p>
*
* @author super_liu
* @since 2022-01-23
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@ApiModel(value="SarBussionessStandState对象", description="企业标准信息复审表")
public class SarBussionessStandState extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键/企业标准信息主键")
@TableField("ID")
private String id;
@ApiModelProperty(value = "企标ID")
@TableField("STAND_ID")
private String standId;
@ApiModelProperty(value = "名称")
@TableField("STAND_NAME")
private String standName;
@ApiModelProperty(value = "企标编号")
@TableField("STAND_CODE")
private String standCode;
@ApiModelProperty(value = "复审时间")
@TableField("REVIEW_TIME")
private Date reviewTime;
@ApiModelProperty(value = "发布日期")
@TableField("ISSUE_TIME")
private Date issueTime;
@ApiModelProperty(value = "复审结果 1 修订、2 废止、3 继续有效")
@TableField("REVIEW_RESULTS")
private Integer reviewResults;
@ApiModelProperty(value = "复审关联流程编号")
@TableField("REVIEW_PROCESS_NUM")
private String reviewProcessNum;
@ApiModelProperty(value = "创建日期")
@TableField("CREATION_TIME")
private Date creationTime;
@ApiModelProperty(value = "更新日期")
@TableField("MODIFY_TIME")
private Date modifyTime;
@TableField("VALID_FLAG")
private Integer validFlag;
@ApiModelProperty(value = "参数1")
@TableField("PARAM1")
private Integer param1;
@ApiModelProperty(value = "参数2")
@TableField("PARAM2")
private String param2;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java
+74
View File
@@ -0,0 +1,74 @@
package com.adc.da.slrs.sarBussionessStandState.entity;
import com.adc.da.base.entity.BaseEntity;
import com.adc.da.sys.common.BasePage;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* <p>
* 企业标准信息复审表
* </p>
*
* @author super_liu
* @since 2022-01-23
*/
@Data
@ApiModel(value="SarBussionessStandStatePage对象", description="企业标准信息复审表分页")
public class SarBussionessStandStatePage extends BasePage {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键/企业标准信息主键")
private String id;
@ApiModelProperty(value = "企标ID")
private String standId;
@ApiModelProperty(value = "名称")
private String standName;
@ApiModelProperty(value = "企标编号")
private String standCode;
@ApiModelProperty(value = "复审时间")
private Date reviewTime;
@ApiModelProperty(value = "发布日期")
private Date issueTime;
@ApiModelProperty(value = "复审结果 1 修订、2 废止、3 继续有效")
private Integer reviewResults;
@ApiModelProperty(value = "复审关联流程编号")
private String reviewProcessNum;
@ApiModelProperty(value = "创建日期")
private Date creationTime;
@ApiModelProperty(value = "更新日期")
private Date modifyTime;
private Integer validFlag;
@ApiModelProperty(value = "参数1")
private Integer param1;
@ApiModelProperty(value = "参数2")
private String param2;
private String reviewTimeStart;
private String reviewTimeEnd;
private String issueTimeStart;
private String issueTimeEnd;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/ISarBussionessStandStateService.java
+21
View File
@@ -0,0 +1,21 @@
package com.adc.da.slrs.sarBussionessStandState.service;
import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState;
import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* <p>
* 企业标准信息复审表 服务类
* </p>
*
* @author super_liu
* @since 2022-01-23
*/
public interface ISarBussionessStandStateService extends IService<SarBussionessStandState> {
List<SarBussionessStandState> getSarBussionessStandStatePage(SarBussionessStandStatePage page) throws Exception;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/impl/SarBussionessStandStateServiceImpl.java
+30
View File
@@ -0,0 +1,30 @@
package com.adc.da.slrs.sarBussionessStandState.service.impl;
import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState;
import com.adc.da.slrs.sarBussionessStandState.dao.SarBussionessStandStateDao;
import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage;
import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 企业标准信息复审表 服务实现类
* </p>
*
* @author super_liu
* @since 2022-01-23
*/
@Service
public class SarBussionessStandStateServiceImpl extends ServiceImpl<SarBussionessStandStateDao, SarBussionessStandState> implements ISarBussionessStandStateService {
@Override
public List<SarBussionessStandState> getSarBussionessStandStatePage(SarBussionessStandStatePage page) throws Exception{
Integer rowCount = this.baseMapper.getBussionessStandStateCount(page);
page.getPager().setRowCount(rowCount);
List<SarBussionessStandState> stateList = this.baseMapper.getBussionessStandStatePage(page);
return stateList;
}
}
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml
+105
View File
@@ -0,0 +1,105 @@
<?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.adc.da.slrs.sarBussionessStandState.dao.SarBussionessStandStateDao">
<resultMap id="BaseResultMap" type="com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState" >
</resultMap>
<sql id="Base_Column_List" >
ID,
STAND_ID,
STAND_NAME,
STAND_CODE,
REVIEW_TIME,
ISSUE_TIME,
REVIEW_RESULTS,
REVIEW_PROCESS_NUM,
CREATION_TIME,
MODIFY_TIME,
VALID_FLAG,
PARAM1,
PARAM2
</sql>
<sql id="SarBussionInfoRole_Where_Clause_Review_Results_N">
where REVIEW_RESULTS IS NULL
AND DATE_FORMAT(REVIEW_TIME, '%Y-%m-%d') between DATE_FORMAT(current_timestamp(), '%Y-%m-%d') AND DATE_ADD(CURDATE(), INTERVAL 30 DAY)
<trim suffixOverrides="," >
<if test="standCode != null and standCode != '' " >
and STAND_CODE like concat(concat('%',#{standCode}),'%')
</if>
<if test="reviewTimeStart != null and reviewTimeStart != '' and reviewTimeEnd != null and reviewTimeEnd != ''">
and DATE_FORMAT(REVIEW_TIME, '%Y-%m-%d') between DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d')
</if>
<if test="reviewTimeStart != null and reviewTimeStart != '' and reviewTimeEnd == null and reviewTimeEnd == ''">
and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%D') &gt;= DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d')
</if>
<if test="reviewTimeStart == null and reviewTimeStart == '' and reviewTimeEnd != null and reviewTimeEnd != ''">
and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%D') &lt;= DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d')
</if>
<if test="issueTimeStart != null and issueTimeStart != '' and issueTimeEnd != null and issueTimeEnd != ''">
and DATE_FORMAT(REVIEW_TIME, '%Y-%m-%d') between DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d')
</if>
<if test="issueTimeStart != null and issueTimeStart != '' and issueTimeEnd == null and issueTimeEnd == ''">
and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%D') &gt;= DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d')
</if>
<if test="issueTimeStart == null and issueTimeStart == '' and issueTimeEnd != null and issueTimeEnd != ''">
and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%D') &lt;= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d')
</if>
</trim>
</sql>
<sql id="SarBussionInfoRole_Where_Clause_Review_Results">
where REVIEW_RESULTS IS NOT NULL
<trim suffixOverrides="," >
<if test="standCode != null and standCode != '' " >
and STAND_CODE like concat(concat('%',#{standCode}),'%')
</if>
<if test="reviewTimeStart != null and reviewTimeStart != '' and reviewTimeEnd != null and reviewTimeEnd != ''">
and DATE_FORMAT(REVIEW_TIME, '%Y-%m-%d') between DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d')
</if>
<if test="reviewTimeStart != null and reviewTimeStart != '' and reviewTimeEnd == null and reviewTimeEnd == ''">
and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%D') &gt;= DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d')
</if>
<if test="reviewTimeStart == null and reviewTimeStart == '' and reviewTimeEnd != null and reviewTimeEnd != ''">
and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%D') &lt;= DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d')
</if>
<if test="issueTimeStart != null and issueTimeStart != '' and issueTimeEnd != null and issueTimeEnd != ''">
and DATE_FORMAT(REVIEW_TIME, '%Y-%m-%d') between DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d')
</if>
<if test="issueTimeStart != null and issueTimeStart != '' and issueTimeEnd == null and issueTimeEnd == ''">
and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%D') &gt;= DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d')
</if>
<if test="issueTimeStart == null and issueTimeStart == '' and issueTimeEnd != null and issueTimeEnd != ''">
and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%D') &lt;= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d')
</if>
</trim>
</sql>
<!-- 分页查询条件当页数据 -->
<select id="getBussionessStandStatePage" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage">
SELECT A.* FROM (
select <include refid="Base_Column_List" />
from sar_bussioness_stand_state
<include refid="SarBussionInfoRole_Where_Clause_Review_Results_N"/>
union
select <include refid="Base_Column_List" />
from sar_bussioness_stand_state
<include refid="SarBussionInfoRole_Where_Clause_Review_Results"/>
ORDER BY
REVIEW_RESULTS ASC,
REVIEW_TIME DESC,
ISSUE_TIME DESC
) A
limit ${pager.startIndex-1},${pageSize}
</select>
<select id="getBussionessStandStateCount" resultType="java.lang.Integer" parameterType="com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage">
select count(1) from (
select id from sar_bussioness_stand_state
<include refid="SarBussionInfoRole_Where_Clause_Review_Results_N"/>
union
select id from sar_bussioness_stand_state
<include refid="SarBussionInfoRole_Where_Clause_Review_Results"/>
) a
</select>
</mapper>