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

Merge branch 'develop_master' into FOTON

Browse Source
This commit is contained in:
super_liu
2022-01-24 20:10:43 +08:00
parent cbd9ca5959 b992c47c94
commit 986092d8ea
20 changed files with 530 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
+4
View File
@@ -199,8 +199,11 @@ public class ActSarItemsEOService {
List<SarStandardsInfo> standlist = sarStandardsInfoEOService.selectStandardsByStandnumber(standnumber, sarStandardsInfoEO.getStandType());
if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) {
sarStandardsInfoEO.setMenuId("64df1d5522bb49c09af2");
sarStandardsInfoEO.setMenuIds("64df1d5522bb49c09af2,"+sarStandardsInfoEO.getMenuIds());
sarStandardsInfoEO.setCountry("CN");
} else if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "FOREIGN".equals(sarStandardsInfoEO.getStandType())) {
sarStandardsInfoEO.setMenuIds("22179d54d4e640098e29,"+sarStandardsInfoEO.getMenuIds());
sarStandardsInfoEO.setMenuId("22179d54d4e640098e29");
}
//此处判断是否是带入的标准
@@ -1109,6 +1112,7 @@ public class ActSarItemsEOService {
case "standSort": sarStandardsInfoEO.setStandSort(valueStr); break;
case "standState": sarStandardsInfoEO.setStandState(valueStr); break;
case "menuId": sarStandardsInfoEO.setMenuId(valueStr); break;
case "menuIds": sarStandardsInfoEO.setMenuIds(valueStr); break;
case "textStatus": sarStandardsInfoEO.setTextStatus(valueStr); break;
case "synopsis": sarStandardsInfoEO.setSynopsis(valueStr); break;
case "fileWord":
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java
+5
View File
@@ -124,6 +124,11 @@ public class SarBussionessStand extends BaseEntity {
@TableField(exist = false)
private String newStandSn;
/**
* 代替企标标准号
*/
@TableField(exist = false)
private String DTQBBHBUSS;
@TableField(exist = false)
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
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/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java
+3 -3
View File
@@ -172,13 +172,13 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
case "会签征求意见":
score=Double.valueOf(item.getScore()) * 0.3;
break;
case "技术委员会负责人/起草中心主任审核":
case "技术委员会评审/评审意见修改评审":
score=Double.valueOf(item.getScore()) * 0.4;
break;
case "标准法规工程师复审":
case "标准法规部标准化工程师复审":
score=Double.valueOf(item.getScore()) * 0.15;
break;
case "标准法规部部长审核":
case "标准法规部高级经理审核":
score=Double.valueOf(item.getScore()) * 0.15;
break;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java
+19 -2
View File
@@ -4,6 +4,8 @@ import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao;
import com.adc.da.slrs.sarLawsAttrDetailedList.entity.*;
import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListService;
import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto;
import com.adc.da.sys.common.SelectionResult;
import com.adc.da.sys.dao.DicTypeEODao;
import com.adc.da.sys.service.IDicTypeEOService;
import com.adc.da.util.UUIDUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -19,6 +21,7 @@ import org.springframework.util.CollectionUtils;
import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
/**
* <p>
@@ -253,11 +256,25 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
return sarLawsAttrDetailedListDao.updateById(sarLawsAttrDetailedList);
}
@Autowired
private DicTypeEODao dicTypeEODao;
@Override
public Map<String, List<String>> selectTimes(String id) {
List<StandRegionalTimeDto> standRegionalTimeDto= sarLawsAttrDetailedListDao.selectTimes(id);
Map<String, Object> map = iDicTypeEOService.getDicTypeListCode();
List<Map<String, String>> arr = (List<Map<String, String>>) map.get("COUNTRY");
// 查询国家地区字典
List<SelectionResult> dicTypeList = dicTypeEODao.getDicTypeByDicId("RFRFRFSCXVB");
List<Map<String, String>> arr = dicTypeList.stream()
.map(item -> {
Map<String, String> map = new HashMap<>();
map.put("lable", item.getLabel());
map.put("value", item.getValue());
return map;
}).collect(Collectors.toList());
// Map<String, Object> map = iDicTypeEOService.getDicTypeListCode();
// List<Map<String, String>> arr = (List<Map<String, String>>) map.get("COUNTRY");
for (StandRegionalTimeDto list1 : standRegionalTimeDto) {
if (StringUtils.isNotBlank(list1.getCountry()) && list1.getCountry().contains(",")) {
String[] split = list1.getCountry().split(",");
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java
+2
View File
@@ -29,4 +29,6 @@ public interface SarStandMenuDao extends BaseMapper<SarStandMenu> {
List<SarStandMenu> selectAllMenuByStandId(SarStandMenu sarStandMenuEO);
List<SarStandMenu> getMenuByStandId(SarStandMenu sarStandMenu);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java
+4 -1
View File
@@ -15,7 +15,7 @@ import org.springframework.data.annotation.Transient;
/**
* <p>
*
*
* </p>
*
* @author super_liu
@@ -58,4 +58,7 @@ public class SarStandMenu extends BaseEntity {
private List<String> menuIds;
@TableField(exist = false)
private String menuName;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+42
View File
@@ -14,6 +14,8 @@ import com.adc.da.http.Result;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
import com.adc.da.slrs.sarLawsInfo.service.ISarLawsInfoService;
import com.adc.da.slrs.sarStandMenu.dao.SarStandMenuDao;
import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu;
import com.adc.da.slrs.sarStandardsInfo.entity.*;
import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService;
import com.adc.da.util.LoginUserUtil;
@@ -553,6 +555,46 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
}
@ApiOperation(value = "在入库流程中配置单个标准的 体系目录 体系目录可以是多个")
@PostMapping("/saveStandardsMenuForFlow")
public ResponseMessage saveStandardsMenuForFlow(@RequestBody SarStandardsInfoEOPage standardsInfoEO) throws Exception {
boolean flag = false;
for (String id : Arrays.asList(standardsInfoEO.getMenuIds().split(","))) {
standardsInfoEO.setMenuId(id);
try {
flag = sarStandardsInfoEOService.updateStandardsMenu(standardsInfoEO);
}catch (NullPointerException e){
flag = sarStandardsInfoEOService.updateStandInfo(standardsInfoEO);
}
if (!flag){
break;
}
}
if (flag){
return Result.success("200","配置成功",true);
}
return Result.error("-1","配置失败");
}
@Autowired
SarStandMenuDao sarStandMenuDao;
@ApiOperation(value = "查询标准所在的 体系目录")
@GetMapping("/getStandMenuId")
public ResponseMessage<List<SarStandMenu>> getStandMenuId(SarStandMenu getStandId){
List<SarStandMenu> sarStandMenus = sarStandMenuDao.getMenuByStandId(getStandId);
return Result.success(sarStandMenus);
}
@ApiOperation(value = "|SarStandardsInfoEO|详情页面查询相近标准")
@GetMapping("/selectCloseStand")
//@RequiresPermissions("lawss:sarStandardsInfo:list")
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java
+3
View File
@@ -186,6 +186,9 @@ public class SarStandardsInfo extends BaseEntity {
private String sarStandAttrEOStr; //新增修改时属性表信息
@TableField(exist = false)
private String menuId; //目录ID
@TableField(exist = false)
private String menuIds; //目录ID
@TableField(exist = false)
private int upReplaceNumFlag; //记录是否修改了替代文件号
@TableField(exist = false)
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java
+5
View File
@@ -103,4 +103,9 @@ public class SarStandardsInfoEOPage extends BasePage {
* 日期范围查询发布日期结束
*/
private String endIssueTime;
/**
* 标准添加到体系中的id多个
*/
private String menuIds;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+35 -7
View File
@@ -814,13 +814,16 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
sarStandardsInfoEO.setCreationTime(new Date());
sarStandardsInfoEO.setModifyTime(new Date());
//根据新建标准所在目录，确定此处是否需要在标准目录关联表中插入数据
if (StringUtils.isNotEmpty(sarStandardsInfoEO.getMenuId())) {
SarStandMenu sarStandMenuEO = new SarStandMenu();
sarStandMenuEO.setStandId(sarStandardsInfoEO.getId());
sarStandMenuEO.setMenuId(sarStandardsInfoEO.getMenuId());
sarStandMenuEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue());
sarStandMenuEO.setId(UUIDUtils.randomUUID20());
sarStandMenuEODao.insert(sarStandMenuEO);
if (StringUtils.isNotEmpty(sarStandardsInfoEO.getMenuIds())) {
for (String menuId : sarStandardsInfoEO.getMenuIds().split(",")) {
SarStandMenu sarStandMenuEO = new SarStandMenu();
sarStandMenuEO.setStandId(sarStandardsInfoEO.getId());
sarStandMenuEO.setMenuId(menuId);
sarStandMenuEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue());
sarStandMenuEO.setId(UUIDUtils.randomUUID20());
sarStandMenuEODao.insert(sarStandMenuEO);
}
}
// 根据其他字段，生成标准状态
updateStandState(sarStandardsInfoEO, null);
@@ -1408,6 +1411,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
sarStandardsInfoEO.setStandState(resultState);
}
@Autowired
private ISarStandardsInfoService sarStandardsInfoEOService;
/***
* @Description: 修改标准
* @Author: yangxuenan
@@ -1458,6 +1465,27 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
// 修改属性表数据
sarStandAttrInfoEODao.deleteStandAttrByStandId(standId);
createStandAttrInfo(sarStandardsInfoEO);
/**
* 编辑体系目录
*/
if (StringUtils.isNotEmpty(sarStandardsInfoEO.getMenuIds())) {
for (String menuId : sarStandardsInfoEO.getMenuIds().split(",")) {
SarStandardsInfoEOPage standardsInfoEO = new SarStandardsInfoEOPage();
standardsInfoEO.setMenuId(menuId);
standardsInfoEO.setIdlist(new String[]{sarStandardsInfoEO.getId()});
try {
sarStandardsInfoEOService.updateStandardsMenu(standardsInfoEO);
}catch (NullPointerException e){
sarStandardsInfoEOService.updateStandInfo(standardsInfoEO);
}
}
}
//编写预警信息
// writeWarnings(sarStandardsInfoEO);
//修改标准过程中，重新修改代替标准号对应的标准的被代替标准号
adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
+2 -1
View File
@@ -788,7 +788,8 @@
WHERE b.VALID_FLAG = 0
</select>
<select id="getFileType" resultType="java.lang.String">
SELECT FILE_type from sar_stand_items WHERE STAND_ID = #{standId} GROUP BY FILE_TYPE
<!-- SELECT FILE_type from sar_stand_items WHERE STAND_ID = #{standId} GROUP BY FILE_TYPE -->
SELECT FILE_type from sar_file_split_info WHERE STAND_ID = #{standId} AND VALID_FLAG = '0' GROUP BY FILE_TYPE
</select>
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml
+16
View File
@@ -82,5 +82,21 @@
from SAR_STAND_MENU
where stand_id = #{standId} and valid_flag=0
</select>
<select id="getMenuByStandId" resultType="com.adc.da.slrs.sarStandMenu.entity.SarStandMenu">
SELECT
SAR_STAND_MENU.valid_flag as validFlag,
menu_id as menuId,
stand_id as standId,
SAR_STAND_MENU.id as id,
MENU_NAME as menuName
FROM
SAR_STAND_MENU
LEFT JOIN ts_resource ON SAR_STAND_MENU.MENU_ID = ts_resource.ID
WHERE
stand_id = #{standId}
AND SAR_STAND_MENU.VALID_FLAG = 0
</select>
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+2 -1
View File
@@ -22,6 +22,7 @@
<result column="stand_year" property="standYear" />
<result column="text_status_buss" property="textStatusBuss" />
<result column="text_status_buss_show" property="textStatusBussShow"/>
<result column="DTQBBHBUSS" property="DTQBBHBUSS"/>
</resultMap>
<resultMap id="BaseResultMapExcel" type="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand" >
@@ -672,7 +673,7 @@
select * from
(select tmp_tb.* from
(select
dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow,
dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow,SAR_BUSS_STAND_ATTR_INFO.DTQBBHBUSS,
<include refid="Base_Column_List_show" />
from SAR_BUSSIONESS_STAND
<include refid="SarBussionInfo_Where_Clause"/>
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>