diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index aba17554..4d70ce34 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -18,6 +18,7 @@ import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlanLog; import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao; +import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo; import com.adc.da.slrs.sarBussStandAttrInfo.service.ISarBussStandAttrInfoService; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; @@ -150,17 +151,52 @@ public class ActSarItemsBussEOService { QueryWrapper wrapper = new QueryWrapper(); wrapper.eq("STAND_ID",standId); List stateList = bussionessStandStateService.list(wrapper); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Integer addYear = 0; + if (standSort.contains("Q/QCBFC")) { + addYear = 3; + }else { + addYear = 5; + } + Date FSDate = sdf.parse(issueTime); + if (ObjectUtils.isNotEmpty(reviewTime)) { + FSDate = new Date(); + } + if(!stateList.isEmpty()){ state.setId(stateList.get(0).getId()); + if ("3".equals(reviewResults)) { + Calendar cal = Calendar.getInstance(); + cal.setTime(FSDate);//设置起时间 + cal.add(Calendar.YEAR, addYear);//增加年份 + cal.add(Calendar.MONTH, -1);//减去一个月 + state.setReviewTime(sdf.format(cal.getTime())); + } bussionessStandStateService.updateById(state); }else { - if(DateUtil.printToDate(reviewTime) != null){ - state.setReviewTime(reviewTime); + if ("3".equals(reviewResults)) { + Calendar cal = Calendar.getInstance(); + cal.setTime(FSDate);//设置起时间 + cal.add(Calendar.YEAR, addYear);//增加年份 + cal.add(Calendar.MONTH, -1);//减去一个月 + state.setReviewTime(sdf.format(cal.getTime())); } state.setCreationTime(DateUtil.printDateAll(new Date())); bussionessStandStateService.save(state); } + if ("3".equals(reviewResults)) { + List sarBussStandAttrInfos = sarBussStandAttrInfoService.list(wrapper); + if (ObjectUtils.isNotEmpty(sarBussStandAttrInfos)) { + Calendar cal = Calendar.getInstance(); + cal.setTime(FSDate);//设置起时间 + cal.add(Calendar.YEAR, addYear);//增加年份 + cal.add(Calendar.MONTH, -1);//减去一个月 + SarBussStandAttrInfo sarBussStandAttrInfo = sarBussStandAttrInfos.get(0); + sarBussStandAttrInfoEODao.updateFSQR(sarBussStandAttrInfo.getId(),sdf.format(cal.getTime())); + } + } + if(StringUtils.isNotBlank(standSort) && !standSort.contains("Q/QCBFC")){ String QCDWID = String.valueOf(standMap.get("QCDWID")); diff --git a/adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java b/adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java index 4dba3f5a..c5aa6213 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java +++ b/adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java @@ -277,5 +277,6 @@ public class SeniorSearchInfoEO extends BasePage { private String standId; + private String clientType; // 客户端类型：空-web端， 2-手机端 } diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index ef43932f..dc15c3fb 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -1632,6 +1632,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { boolQueryShould .should(QueryBuilders.wildcardQuery("sortTitle.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(1005f)) //非 .keyword 无法查询出结果 + .should(QueryBuilders.termQuery("numberTitle.keyword",searchInfoEO.getSelectValue()).boost(1004f)) .should(QueryBuilders.wildcardQuery("numberTitle.keyword","*" + searchInfoEO.getSelectValue() + "*").boost(1004f)) .should(QueryBuilders.wildcardQuery("yearOrder.keyword","*" + searchInfoEO.getSelectValue() + "*").boost(1003f)) .should(QueryBuilders.wildcardQuery("nameTitle.keyword","*" + searchInfoEO.getSelectValue() + "*").boost(1002f)) @@ -1645,6 +1646,10 @@ public class SearchCenterServiceImpl implements SearchCenterService { // queryBuilder1 = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), // "title" // ).minimumShouldMatch("100%").field("title",1000f); + + if ("2".equals(searchInfoEO.getClientType())) { + boolQueryBuilder.mustNot(QueryBuilders.termQuery("standTypeOrder", "3")); + } boolQueryBuilder.must(boolQueryShould); } @@ -1684,9 +1689,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { searchRequestBuilder = client.prepareSearch("fulltextserch") .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) .highlighter(hiBuilder) - .addSort(new ScoreSortBuilder().order(SortOrder.DESC)) .addSort("standTypeOrder",SortOrder.ASC) .addSort("standSortOrder",SortOrder.ASC) + .addSort(new ScoreSortBuilder().order(SortOrder.DESC)) .addSort("numberTitle",SortOrder.ASC) .addSort("yearOrder.keyword",SortOrder.DESC) .addSort("sortTitle.keyword",SortOrder.ASC) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java index 8d8b9259..f246215b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java @@ -78,7 +78,8 @@ public class exportWkExcel { char letter = 'A'; for(letter = 'A'; letter <= 'Z'; ++letter){ Map typeMap = new HashMap<>(); - typeMap.put("Q/FT "+letter,"Q/FT "+letter); + typeMap.put("label","Q/FT "+letter); + typeMap.put("value","Q/FT "+letter); bussStandTypeList.add(typeMap); } resultMap.put("BUSSSTANDCLASS",bussStandTypeList); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java index 0b9eb8fc..9afeac88 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java @@ -45,4 +45,6 @@ public interface SarBussStandAttrInfoDao extends BaseMapper selectStandFieldAndData(@Param("fieldInfo") String fieldInfo, @Param("standId") String standId); + void updateFSQR(@Param("id") String id,@Param("time") String time); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java index 60d50527..ad0efc6e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java @@ -15,6 +15,7 @@ import com.adc.da.slrs.sarRole.service.ITsRoleService; import com.adc.da.sys.entity.UserEO; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.ObjectUtils; import org.apache.ibatis.annotations.Delete; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -104,7 +105,7 @@ public class TsRoleController extends BaseController { // tsRole.setParent(parent.getName()); // } TsRole tsRole=tsRoleDao.getAllDatas(roleId); - if(tsRole.getParentId()!=null){ + if(ObjectUtils.isNotEmpty(tsRole.getParentId())){ TsRole parent=tsRoleDao.getAllDatas(tsRole.getParentId()); tsRole.setParent(parent.getName()); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java index b93029f4..836d7a5b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java @@ -16,6 +16,7 @@ import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.utils.util.ListUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.EnableAsync; @@ -99,7 +100,7 @@ public class TsRoleServiceImpl extends ServiceImpl implements @Override public ResponseMessage addRole(TsRole tsRole) { //判断是否是顶级角色 - if(tsRole.getParentId()==null){ + if(ObjectUtils.isEmpty(tsRole.getParentId())){ tsRole.setRoleHierarchy(1); }else { QueryWrapper parentQueryWrapper=new QueryWrapper<>(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index 26ecbf36..54ae351c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -478,8 +478,10 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl0L) { - p.setUnCount(s.getUnCount()); + p.setUnCount(s.getUnCount()); // uncount==0 }else if (s.getUnCount() == 0L && s.getCounts()==0L){ p.setUnCount(2L); - }else { - p.setUnCount(1L); + }else { // 有不满足时 + p.setUnCount(1L); // 不符合 } p.setEndTimes(s.getEndTimes()); for (SarStandAttrInfo a:list2){ @@ -573,12 +576,11 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl + + + update SAR_BUSS_STAND_ATTR_INFO set FSRQBUSS = #{time} + where id = #{id} + + + 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 0bb01089..ecf551f9 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 @@ -393,20 +393,20 @@ parameterType="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand"> SELECT , - DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 5 YEAR),INTERVAL 1 MONTH) AS reviewTime + DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 3 YEAR),INTERVAL 1 MONTH) AS reviewTime 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) UNION SELECT , - DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 3 YEAR),INTERVAL 1 MONTH) AS reviewTime + DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 5 YEAR),INTERVAL 1 MONTH) AS reviewTime 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) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index f1b4bd5b..90d86638 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -418,7 +418,7 @@ @@ -457,7 +460,12 @@ and sar_stand_project_library.category_name=#{sarStandProjectLibrary.categoryName} - )a + + + and sar_stand_project_library.project_group like concat(concat('%',#{sarStandProjectLibrary.projectGroup}),'%') + + GROUP BY sar_stand_project_library.project_group + )a