diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 3895b5e2..25d7f074 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -54,6 +54,8 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/att/attFile/upload"); addInterceptor.excludePathPatterns("/api/sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel"); addInterceptor.excludePathPatterns("/api/lawss/sarLawsInfo/exportStandardsInfoExcel"); + // 提供自动发起复审流程 复审数据 + addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStandState/getSarBussionessStandStateProcessList"); //pcms项目数据下发开放接口 addInterceptor.excludePathPatterns("/api/sarStandProjectLibrary/save"); addInterceptor.excludePathPatterns("/api/sar-stand-project-team/save"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/controller/SarBussionessStandStateController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/controller/SarBussionessStandStateController.java index ad89adae..55156bb7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/controller/SarBussionessStandStateController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/controller/SarBussionessStandStateController.java @@ -4,6 +4,7 @@ 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.ModelData; import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage; import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService; import com.adc.da.util.LoginUserUtil; @@ -12,6 +13,7 @@ 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.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; import io.swagger.annotations.Api; @@ -36,6 +38,17 @@ public class SarBussionessStandStateController extends BaseController getSarBussionessStandStateProcessList(SarBussionessStandStatePage page){ + return bussionessStandStateService.getSarBussionessStandStateProcessList(page); + } + /** * 自定义分页复审流程查询列表 * @param page 标准信息 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/dao/SarBussionessStandStateDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/dao/SarBussionessStandStateDao.java index 71f7fcdd..41d99458 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/dao/SarBussionessStandStateDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/dao/SarBussionessStandStateDao.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.sarBussionessStandState.dao; +import com.adc.da.slrs.sarBussionessStandState.entity.ModelData; import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -16,6 +17,8 @@ import java.util.List; */ public interface SarBussionessStandStateDao extends BaseMapper { + List getSarBussionessStandStateProcessList(SarBussionessStandStatePage page); + List getBussionessStandStatePage(SarBussionessStandStatePage page); int getBussionessStandStateCount(SarBussionessStandStatePage page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/ModelData.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/ModelData.java new file mode 100644 index 00000000..caeac8e1 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/ModelData.java @@ -0,0 +1,45 @@ +/** + * Copyright 2022 bejson.com + */ +package com.adc.da.slrs.sarBussionessStandState.entity; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +/** + * Auto-generated: 2022-06-23 15:31:2 + * + * @author bejson.com (i@bejson.com) + * @website http://www.bejson.com/java2pojo/ + */ +@Data +public class ModelData { + + private String id; + private String standId; + private String standName; + private String standCode; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String reviewTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String issueTime; + private String reviewResults; + private String reviewProcessNum; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String creationTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String modifyTime; + private int validFlag; + private String param1; + private String param2; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String putTime; + private String standSort; + private String qcdw; + private String fsrqbuss; + private String qcrbuss; + private String processStatus; + private String bussFsSubUser1; + private String bussFsSubUser1Name; +} \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/ISarBussionessStandStateService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/ISarBussionessStandStateService.java index e5800a99..a2b74dc4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/ISarBussionessStandStateService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/ISarBussionessStandStateService.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.sarBussionessStandState.service; +import com.adc.da.slrs.sarBussionessStandState.entity.ModelData; import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage; import com.baomidou.mybatisplus.extension.service.IService; @@ -16,6 +17,8 @@ import java.util.List; */ public interface ISarBussionessStandStateService extends IService { + List getSarBussionessStandStateProcessList(SarBussionessStandStatePage page); + List getSarBussionessStandStatePageNo(SarBussionessStandStatePage page) throws Exception; List getSarBussionessStandStatePage(SarBussionessStandStatePage page) throws Exception; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/impl/SarBussionessStandStateServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/impl/SarBussionessStandStateServiceImpl.java index 28159d8c..45f6d072 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/impl/SarBussionessStandStateServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/impl/SarBussionessStandStateServiceImpl.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.sarBussionessStandState.service.impl; +import com.adc.da.slrs.sarBussionessStandState.entity.ModelData; import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; import com.adc.da.slrs.sarBussionessStandState.dao.SarBussionessStandStateDao; import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage; @@ -20,6 +21,12 @@ import java.util.List; @Service public class SarBussionessStandStateServiceImpl extends ServiceImpl implements ISarBussionessStandStateService { + @Override + public List getSarBussionessStandStateProcessList(SarBussionessStandStatePage page){ + List stateList = this.baseMapper.getSarBussionessStandStateProcessList(page); + return stateList; + } + @Override public List getSarBussionessStandStatePageNo(SarBussionessStandStatePage page) throws Exception{ Integer rowCount = this.baseMapper.getBussionessStandStateCountNo(page); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 5e7856b7..722fb711 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -392,7 +392,7 @@ FROM sar_bussioness_stand WHERE stand_sort = 'Q/QCBFC' AND ISSUE_TIME IS NOT NULL - AND DATE_FORMAT(DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 3 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d') + AND DATE_FORMAT(DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 5 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d') BETWEEN DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_ADD(DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d'),INTERVAL 1 DAY) UNION SELECT @@ -401,7 +401,7 @@ FROM sar_bussioness_stand WHERE stand_sort != 'Q/QCBFC' AND ISSUE_TIME IS NOT NULL - AND DATE_FORMAT(DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 5 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d') + AND DATE_FORMAT(DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 3 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d') BETWEEN DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_ADD(DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d'),INTERVAL 1 DAY) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml index b084de85..9ecee506 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml @@ -5,6 +5,9 @@ + + + sar_bussioness_stand_state.ID, sar_bussioness_stand_state.STAND_ID, @@ -33,6 +36,60 @@ sar_bussioness_stand.VALID_FLAG + + where sar_bussioness_stand.stand_sort = 'Q/QCBFC' and sar_bussioness_stand.TEXT_STATUS_BUSS = '9z741h2m3j' AND sar_bussioness_stand.ISSUE_TIME IS NOT NULL and sar_bussioness_stand.VALID_FLAG = '0' + AND DATE_FORMAT(DATE_SUB(DATE_ADD(sar_bussioness_stand.ISSUE_TIME, INTERVAL 5 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d') = DATE_FORMAT(current_timestamp(), '%Y-%m-%d') + + + and STAND_CODE like concat(concat('%',#{standCode}),'%') + + + and DATE_FORMAT(sar_buss_stand_attr_info.FSRQBUSS, '%Y-%m-%d') between DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d') + + + and DATE_FORMAT(sar_buss_stand_attr_info.FSRQBUSS,'%Y-%m-%d') >= DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d') + + + and DATE_FORMAT(sar_buss_stand_attr_info.FSRQBUSS,'%Y-%m-%d') <= DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d') + + + and DATE_FORMAT(sar_bussioness_stand.ISSUE_TIME, '%Y-%m-%d') between DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') + + + and DATE_FORMAT(sar_bussioness_stand.ISSUE_TIME,'%Y-%m-%d') >= DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') + + + and DATE_FORMAT(sar_bussioness_stand.ISSUE_TIME,'%Y-%m-%d') <= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') + + + + + where sar_bussioness_stand.stand_sort != 'Q/QCBFC' and sar_bussioness_stand.TEXT_STATUS_BUSS = '9z741h2m3j' AND sar_bussioness_stand.ISSUE_TIME IS NOT NULL and sar_bussioness_stand.VALID_FLAG = '0' + AND DATE_FORMAT(DATE_SUB(DATE_ADD(sar_bussioness_stand.ISSUE_TIME, INTERVAL 3 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d') = DATE_FORMAT(current_timestamp(), '%Y-%m-%d') + + + and STAND_CODE like concat(concat('%',#{standCode}),'%') + + + and DATE_FORMAT(sar_buss_stand_attr_info.FSRQBUSS, '%Y-%m-%d') between DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d') + + + and DATE_FORMAT(sar_buss_stand_attr_info.FSRQBUSS,'%Y-%m-%d') >= DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d') + + + and DATE_FORMAT(sar_buss_stand_attr_info.FSRQBUSS,'%Y-%m-%d') <= DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d') + + + and DATE_FORMAT(sar_bussioness_stand.ISSUE_TIME, '%Y-%m-%d') between DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') + + + and DATE_FORMAT(sar_bussioness_stand.ISSUE_TIME,'%Y-%m-%d') >= DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') + + + and DATE_FORMAT(sar_bussioness_stand.ISSUE_TIME,'%Y-%m-%d') <= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') + + + where sar_bussioness_stand.TEXT_STATUS_BUSS = '9z741h2m3j' AND sar_bussioness_stand.ISSUE_TIME IS NOT NULL and sar_bussioness_stand.VALID_FLAG = '0' @@ -113,6 +170,63 @@ + +