diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index 88bf5c29..75b56cc7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -8,6 +8,7 @@ import com.adc.da.http.Result; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; import com.adc.da.slrs.sarStandItems.entity.*; import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; @@ -55,7 +56,7 @@ public class SarStandItemsController extends BaseController { @ApiOperation(value = "分解单查询") @GetMapping("/querySarItemAndInterpretation") - public ResponseMessage querySarItemAndInterpretation(FindSarItemsPageReqDTO page){ + public ResponseMessage> querySarItemAndInterpretation(FindSarItemsPageReqDTO page){ List rows = ServiceImpl.querySarItemAndInterpretation(page); PageInfo pageInfo = getPageInfo(page.getPager(), rows); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java index 3833259b..543cccc9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java @@ -13,9 +13,6 @@ import java.util.Date; public class FindSarItemsPageReqDTO extends BasePage { private static final long serialVersionUID = 1L; - private Integer page = 1; - private Integer pageSize = 20; - @ApiModelProperty(value = "标准id") private String standId; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index cc30e365..4cc9288f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -225,10 +225,6 @@ public class SarStandItemsServiceImpl extends ServiceImpl querySarItemAndInterpretation(FindSarItemsPageReqDTO page){ - //分页查询的总数 - Integer count=dao.sarItemCount(page); - page.getPager().setRowCount(count); - //排序 if (page.getOrderBy()!=null && page.getOrder()!=null){ @@ -241,9 +237,14 @@ public class SarStandItemsServiceImpl extends ServiceImpl sarStandItems = dao.querySarItemAndInterpretation(page); return sarStandItems; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index 59218feb..9e07c26a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -31,7 +31,7 @@ public interface SarStandardsInfoDao extends BaseMapper { List selectStandardsByStandnumber(SarStandardsInfo sarStandardsInfoEO); - List queryStandInfoByList(@Param("limit") Integer limit); + List queryStandInfoByList(@Param("limit") Integer limit,@Param("typeCode") String typeCode); Integer selectStandColumn(@Param("columnName") String columnName); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 31c274c3..5b3dc546 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -49,6 +49,10 @@ import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; +import com.adc.da.slrs.tsDictionaryType.dao.TsDicTypeDao; +import com.adc.da.slrs.tsDictionaryType.dao.TsDictionaryDao; +import com.adc.da.slrs.tsDictionaryType.entity.TsDicType; +import com.adc.da.slrs.tsDictionaryType.entity.TsDictionary; import com.adc.da.sys.common.SelectionResult; import com.adc.da.sys.constant.ValueStateEnum; import com.adc.da.sys.dao.DicTypeEODao; @@ -203,6 +207,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getStandInfoByList(String limit){ - return dao.queryStandInfoByList(Integer.valueOf(limit)); + + //查询文本状态为即将实施的 + QueryWrapper dictionaryWrapper = new QueryWrapper<>(); + dictionaryWrapper.select("ID") + .eq("DICTIONARY_NAME","文本状态"); + List> dicMaps = tsDictionaryDao.selectMaps(dictionaryWrapper); + + + QueryWrapper dicTypeWrapper = new QueryWrapper<>(); + dicTypeWrapper.select("DIC_TYPE_CODE") + .eq("DIC_ID",dicMaps.get(0).get("ID").toString()) + .eq("DIC_TYPE_NAME","即将实施"); + + List> typeMaps = tsDicTypeDao.selectMaps(dicTypeWrapper); + + + List standInfoList = dao.queryStandInfoByList(Integer.valueOf(limit), typeMaps.get(0).get("DIC_TYPE_CODE").toString()); + return standInfoList; } /** diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index 91b02664..5ffde997 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -335,7 +335,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService middle=messageList; for (SarFileSplitItemsEO mis:messageList) { mis.setWorkFlowShow("1"); - if (mis.getItemsNum().equals("1") || mis.getItemsNum().startsWith("1.") || mis.getItemsNum().equals("2") || mis.getItemsNum().startsWith("2.") || mis.getItemsNum().equals("3") || mis.getItemsNum().startsWith("3.")){ + if (mis.getItemsNum().equals("2") || mis.getItemsNum().startsWith("2.") || mis.getItemsNum().equals("3") || mis.getItemsNum().startsWith("3.")){ mis.setWorkFlowShow("0"); } else { @@ -349,6 +349,11 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService } } } + messageList.forEach(sarFileSplitItemsEO -> { + if (sarFileSplitItemsEO.getItemsNum().equals("1")){ + sarFileSplitItemsEO.setWorkFlowShow("1"); + } + }); sarFileSplitMenuEODao.insertForeach(treeList); sarFileSplitItemsEODao.insertForeach(messageList); sarFileSplitItemsValEODao.insertForeach(itemValList); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index 64aa146f..32a31e9c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -408,16 +408,14 @@ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml index a6a1d552..18a45507 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml @@ -8,13 +8,15 @@ - + + + - select FROM sar_standards_info LEFT JOIN sar_stand_attr_info ssai ON ssai.STAND_ID = SAR_STANDARDS_INFO.ID - WHERE DATE_FORMAT(ssai.SSRQ,'%Y-%m-%D') >= DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME,'%Y-%m-%D') + WHERE + DATE_FORMAT(ssai.SSRQ, '%Y-%m-%d') >= DATE_FORMAT( + SAR_STANDARDS_INFO.ISSUE_TIME, + '%Y-%m-%d' + ) + AND + sar_standards_info.VALID_FLAG='0' + AND TEXT_STATUS=#{typeCode} ORDER BY SAR_STANDARDS_INFO.ISSUE_TIME DESC LIMIT #{limit}