diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java index 1f250cad..32f4d761 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java @@ -20,6 +20,7 @@ import com.adc.da.slrs.sarStandAttrInfo.service.ISarStandAttrInfoService; import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao; import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.sarStandVal.entity.SarStandVal; +import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; @@ -88,6 +89,9 @@ public class ActSarItemsEOService { @Autowired private SarStandItemValDao sarStandItemValEODao; + @Autowired + private SarStandardsInfoDao sarStandardsInfoDao; + @Value("${elas.flag}") private boolean elasflag; @@ -192,6 +196,22 @@ public class ActSarItemsEOService { // attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus()); String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); sarStandardsInfoEO.setSarStandAttrEOStr(resData); + if (org.apache.commons.lang3.StringUtils.isNotBlank(sarStandardsInfoEO.getReplaceStandNum())){ + sarStandardsInfoDao.updateById(sarStandardsInfoEO); + String id = sarStandardsInfoEO.getStandName(); + SarStandardsInfo sarStandardsInfo = sarStandardsInfoDao.selectBy(id); + if (sarStandardsInfo != null){ + String textStatus = "chblaarg77"; + sarStandardsInfo.setTextStatus(textStatus); + sarStandardsInfoDao.updateById(sarStandardsInfo); + } + SarStandardsInfo sarStandardsInfo1 = sarStandardsInfoDao.selectBy1(id); + if (sarStandardsInfo1 != null){ + String textStatus = "chblaarg77"; + sarStandardsInfo1.setTextStatus(textStatus); + sarStandardsInfoDao.updateById(sarStandardsInfo1); + } + } // 根据标准号判断数据是否已存在 //2021年4月9日 此处检查当前是否存在standId diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java index 97498020..e0e754d2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java @@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import java.util.Date; +import java.util.List; /** *

@@ -77,5 +78,13 @@ public class SarBussionessStandStatePage extends BasePage { @ApiModelProperty(value = "标准类别") private String menuId; + private List menuAllChildrenIdList; + + private String userId; + + private String treeType; + + private List menuRoleList; + } 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 45f6d072..a63e9296 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 @@ -5,7 +5,14 @@ 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.adc.da.slrs.sarResource.entity.TsResource; +import com.adc.da.slrs.sarResource.service.ITsResourceService; +import com.adc.da.slrs.sarUser.service.ITsUserService; +import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService; +import com.adc.da.util.utils.StringUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -21,6 +28,15 @@ import java.util.List; @Service public class SarBussionessStandStateServiceImpl extends ServiceImpl implements ISarBussionessStandStateService { + @Autowired + private ISarMenuStandardService iSarMenuStandardService; + + @Autowired + private ITsResourceService iTsResourceService; + + @Autowired + private ITsUserService tsUserService; + @Override public List getSarBussionessStandStateProcessList(SarBussionessStandStatePage page){ List stateList = this.baseMapper.getSarBussionessStandStateProcessList(page); @@ -29,6 +45,54 @@ public class SarBussionessStandStateServiceImpl extends ServiceImpl getSarBussionessStandStatePageNo(SarBussionessStandStatePage page) throws Exception{ + if(page.getMenuId()!=null && StringUtils.isNotBlank(page.getMenuId())){ + + } + //查询当前登录人角色拥有权限的菜单 + if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){ + String treeType = page.getTreeType(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("ID",page.getMenuId()); + qw.isNull("PARENT_ID"); + List children = iTsResourceService.list(qw); + + if(children.isEmpty() && !page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(treeType) && "tsr".equals(treeType)){ + List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); + if (getMenuIdList != null && !getMenuIdList.isEmpty()) { + page.setMenuRoleList(getMenuIdList); + } else { + page.setMenuRoleList(null); + } + List ids = iTsResourceService.getChildMenuList(page.getMenuId()); + if (ids != null && !ids.isEmpty()) { + page.setMenuAllChildrenIdList(ids); + } + }else if(!page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(treeType) && "sarMs".equals(treeType)){ + List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); + if (getMenuIdList != null && !getMenuIdList.isEmpty()) { + page.setMenuRoleList(getMenuIdList); + } else { + page.setMenuRoleList(null); + } + List ids = iSarMenuStandardService.getChildMenuList(page.getMenuId()); + if (ids != null && !ids.isEmpty()) { + page.setMenuAllChildrenIdList(ids); + } + } + +// if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ +// List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); +// if (getMenuIdList != null && !getMenuIdList.isEmpty()) { +// page.setMenuRoleList(getMenuIdList); +// } else { +// page.setMenuRoleList(null); +// } +// List ids = iTsResourceService.getChildMenuList(page.getMenuId()); +// if (ids != null && !ids.isEmpty()) { +// page.setMenuAllChildrenIdList(ids); +// } +// } + } Integer rowCount = this.baseMapper.getBussionessStandStateCountNo(page); page.getPager().setRowCount(rowCount); List stateList = this.baseMapper.getSarBussionessStandStatePageNo(page); @@ -37,6 +101,51 @@ public class SarBussionessStandStateServiceImpl extends ServiceImpl getSarBussionessStandStatePage(SarBussionessStandStatePage page) throws Exception{ + //查询当前登录人角色拥有权限的菜单 + if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){ + String treeType = page.getTreeType(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("ID",page.getMenuId()); + qw.isNull("PARENT_ID"); + List children = iTsResourceService.list(qw); + + if(children.isEmpty() && !page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(treeType) && "tsr".equals(treeType)){ + List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); + if (getMenuIdList != null && !getMenuIdList.isEmpty()) { + page.setMenuRoleList(getMenuIdList); + } else { + page.setMenuRoleList(null); + } + List ids = iTsResourceService.getChildMenuList(page.getMenuId()); + if (ids != null && !ids.isEmpty()) { + page.setMenuAllChildrenIdList(ids); + } + }else if(!page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(treeType) && "sarMs".equals(treeType)){ + List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); + if (getMenuIdList != null && !getMenuIdList.isEmpty()) { + page.setMenuRoleList(getMenuIdList); + } else { + page.setMenuRoleList(null); + } + List ids = iSarMenuStandardService.getChildMenuList(page.getMenuId()); + if (ids != null && !ids.isEmpty()) { + page.setMenuAllChildrenIdList(ids); + } + } + +// if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ +// List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); +// if (getMenuIdList != null && !getMenuIdList.isEmpty()) { +// page.setMenuRoleList(getMenuIdList); +// } else { +// page.setMenuRoleList(null); +// } +// List ids = iTsResourceService.getChildMenuList(page.getMenuId()); +// if (ids != null && !ids.isEmpty()) { +// page.setMenuAllChildrenIdList(ids); +// } +// } + } Integer rowCount = this.baseMapper.getBussionessStandStateCount(page); page.getPager().setRowCount(rowCount); List stateList = this.baseMapper.getBussionessStandStatePage(page); 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 ec02df24..c2488196 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 @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import org.springframework.stereotype.Repository; import javax.annotation.Resource; @@ -117,5 +118,9 @@ public interface SarStandardsInfoDao extends BaseMapper { List listQuery2(SarStandardsInfoEOPage page); List selectStandardsByStandnumber2(SarStandardsInfo sarStandardsInfoEO); + + SarStandardsInfo selectBy(String id); + + SarStandardsInfo selectBy1(String id); } 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 d1fd828e..d7cdb6ec 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 @@ -88,6 +88,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import net.sf.json.JSONObject; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.util.PDFTextStripper; @@ -1329,6 +1330,22 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl - - - + + + - - - - + + + + and SAR_BUSS_STAND_MENU.MENU_ID in 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 97351c0b..dab3bdeb 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 @@ -21,7 +21,9 @@ sar_bussioness_stand_state.MODIFY_TIME, sar_bussioness_stand_state.VALID_FLAG, sar_bussioness_stand_state.PARAM1, - sar_bussioness_stand_state.PARAM2 + sar_bussioness_stand_state.PARAM2, + sar_buss_stand_attr_info.QCDW As 'QCDW', + sar_buss_stand_attr_info.QCRBUSS AS 'QCRBUSS' DISTINCT sar_bussioness_stand.ID, @@ -117,6 +119,35 @@ and QCDW like concat(concat('%',#{QCDW}),'%') + + + + and SAR_BUSS_STAND_MENU.MENU_ID IS NULL + + + + + and SAR_BUSS_STAND_MENU.MENU_ID in + + #{item} + + + + + + + + + + + + + + and SAR_BUSS_STAND_MENU.MENU_ID in + + #{item} + + @@ -144,6 +175,38 @@ and DATE_FORMAT(ISSUE_TIME,'%Y-%m-%d') <= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') + + and QCDW like concat(concat('%',#{QCDW}),'%') + + + + + and SAR_BUSS_STAND_MENU.MENU_ID IS NULL + + + + + and SAR_BUSS_STAND_MENU.MENU_ID in + + #{item} + + + + + + + + + + + + + + and SAR_BUSS_STAND_MENU.MENU_ID in + + #{item} + + @@ -170,6 +233,38 @@ and DATE_FORMAT(ISSUE_TIME,'%Y-%m-%d') <= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') + + and QCDW like concat(concat('%',#{QCDW}),'%') + + + + + and SAR_BUSS_STAND_MENU.MENU_ID IS NULL + + + + + and SAR_BUSS_STAND_MENU.MENU_ID in + + #{item} + + + + + + + + + + + + + + and SAR_BUSS_STAND_MENU.MENU_ID in + + #{item} + + @@ -254,6 +349,7 @@ sar_buss_stand_attr_info.QCRBUSS from sar_bussioness_stand LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand.id + left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id ) A ORDER BY @@ -276,10 +372,14 @@ SELECT A.* FROM ( select from sar_bussioness_stand_state + LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id + LEFT JOIN SAR_BUSS_STAND_MENU ON sar_bussioness_stand_state.stand_id = SAR_BUSS_STAND_MENU.buss_stand_id union select from sar_bussioness_stand_state + LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id + LEFT JOIN SAR_BUSS_STAND_MENU ON sar_bussioness_stand_state.stand_id = SAR_BUSS_STAND_MENU.buss_stand_id ORDER BY REVIEW_RESULTS ASC, @@ -291,10 +391,20 @@ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index f5405ad9..326dad79 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -2039,5 +2039,36 @@ + + +