diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarLawsInformationEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarLawsInformationEOService.java index 4a98ff62..2d4860be 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarLawsInformationEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarLawsInformationEOService.java @@ -29,17 +29,16 @@ public class ActSarLawsInformationEOService { SarLawsInformation sarLawsInformation = JSONObject.parseObject(lawsInformationInfo, SarLawsInformation.class); JSONObject jsonObject = JSONObject.parseObject(lawsInformationInfo); String applyUserId = jsonObject.getString("applyUserId"); - String applyUserName = jsonObject.getString("applyUserName"); +// String applyUserName = jsonObject.getString("applyUserName"); String approverId = jsonObject.getString("approverId"); - String approverName = jsonObject.getString("approverName"); +// String approverName = jsonObject.getString("approverName"); String createAndApproveBy = ""; // 判断发起人和审批人是否相同 if (approverId.equals(applyUserId)) { - createAndApproveBy = applyUserName + "(" + applyUserId + ")"; + createAndApproveBy = applyUserId; }else { - createAndApproveBy = applyUserName + "(" + applyUserId + ")," + approverName + "(" + approverId + ")"; + createAndApproveBy = applyUserId + "," + approverId; } - sarLawsInformation.setCreateAndApproveBy(createAndApproveBy); sarLawsInformation.setDownloadableBy(createAndApproveBy); sarLawsInformation.setViewableBy(createAndApproveBy); logger.info("政策法规资料入库：" + sarLawsInformation); 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 51def962..ffd39451 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 @@ -196,8 +196,18 @@ public class WebMvcConfig implements WebMvcConfigurer { // 政策课题导出接口 addInterceptor.excludePathPatterns("/api/lawss/sarLawsTopic/exportLawsTopicInfo"); + // 政策资料导出接口 addInterceptor.excludePathPatterns("/api/lawss/sarLawsInformation/exportLawsInformationInfo"); + // 内外部会议模板下载 + addInterceptor.excludePathPatterns("/api/lawss/insideOutsideMeeting/exportTemplateFile"); + + // 政策课题模板下载 + addInterceptor.excludePathPatterns("/api/lawss/sarLawsTopic/exportTemplateFile"); + + // 政策资料模板下载 + addInterceptor.excludePathPatterns("/api/lawss/sarLawsInformation/exportTemplateFile"); + // // 添加自定义拦截器，并拦截对应 url addInterceptor.addPathPatterns("/**"); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/dao/InsideOutsideMeetingDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/dao/InsideOutsideMeetingDao.java index 98537ae7..4dca1bcb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/dao/InsideOutsideMeetingDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/dao/InsideOutsideMeetingDao.java @@ -16,7 +16,7 @@ import java.util.List; @Mapper public interface InsideOutsideMeetingDao extends BaseMapper { - Integer queryByPageCount(InsideOutsideMeetingVO page); + List queryByPageCount(InsideOutsideMeetingVO page); List queryByPage(InsideOutsideMeetingVO page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java index d4297649..4967e9aa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java @@ -86,7 +86,9 @@ public class InsideOutsideMeetingVO extends BasePage { private String sortMode = "asc"; - private String meetingTimeOperator = "="; + // 会议时间查询字段 + private Date meetingTimeBegin; + private Date meetingTimeEnd; // 导出使用字段 // 被前端选中的记录的ids diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java index d3305cc3..250c16d0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java @@ -187,7 +187,7 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl insideOutsideMeetingVOList = this.baseMapper.queryByPage(page); for (InsideOutsideMeetingVO insideOutsideMeeting : insideOutsideMeetingVOList) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java index f10d5d5d..fa4476ff 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -8,8 +8,7 @@ import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; -import com.adc.da.slrs.sarEnterpriseStandardEvaluation.dao.QualityEvaluationDao; -import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IQualityEvaluationService; import com.adc.da.utils.util.EsRevisePlanExportUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.ApiOperation; @@ -29,10 +28,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; /** *

@@ -52,7 +48,7 @@ public class EsRevisePlanController extends BaseController { @Autowired IEsRevisePlanService iEsRevisePlanService; @Autowired - private QualityEvaluationDao qualityEvaluationDao; + private IQualityEvaluationService qualityEvaluationService; @ApiOperation(value = "获取所有企标计划") @GetMapping("getAllPlans") @@ -106,38 +102,41 @@ public class EsRevisePlanController extends BaseController { revisePlan.setArea(area); //查评分 if (ObjectUtils.isNotEmpty(revisePlan.getStandId())) { - List last = new ArrayList<>(); - List evaluations = qualityEvaluationDao.getEvaluationForm(new QueryWrapper().eq("law_id", revisePlan.getStandId()).eq("evaluation_type", "quality")); - for (QualityEvaluation evaluation : evaluations) { - Double score; - String value; - if (evaluation.getProcessNode()==null){ - value=""; - }else { - value=evaluation.getProcessNode(); - } - String evaluationScore = ObjectUtils.isEmpty(evaluation.getScore()) ? "0" : evaluation.getScore(); - switch (value){ - case "征求意见": - score=Double.valueOf(evaluationScore) * 0.3; - break; - case "技术委员会评审、评审意见修改": - score=Double.valueOf(evaluationScore) * 0.4; - break; - case "重新技术委员会评审、评审意见修改": - score=Double.valueOf(evaluationScore) * 0.4; - break; - case "标准化复审": - score=Double.valueOf(evaluationScore) * 0.15; - break; - case "标准法规部高级经理审核": - score=Double.valueOf(evaluationScore) * 0.15; - break; - default: score=Double.valueOf(evaluationScore); - } - last.add(score); - } - revisePlan.setScore(last.stream().mapToDouble(Double::doubleValue).sum()); + Map score = qualityEvaluationService.getScore(revisePlan.getStandId()); + revisePlan.setScore(score.get("finalScore")); +// List last = new ArrayList<>(); +// List evaluations = qualityEvaluationDao.getEvaluationForm(new QueryWrapper().eq("law_id", revisePlan.getStandId()).eq("evaluation_type", "quality")); +// for (QualityEvaluation evaluation : evaluations) { +// Double score; +// String value; +// if (evaluation.getProcessNode()==null){ +// value=""; +// }else { +// value=evaluation.getProcessNode(); +// } +// String evaluationScore = ObjectUtils.isEmpty(evaluation.getScore()) ? "0" : evaluation.getScore(); +// switch (value){ +// case "征求意见": +// score=Double.valueOf(evaluationScore) * 0.3; +// break; +// case "技术委员会评审、评审意见修改": +// score=Double.valueOf(evaluationScore) * 0.4; +// break; +// case "重新技术委员会评审、评审意见修改": +// score=Double.valueOf(evaluationScore) * 0.4; +// break; +// case "标准化复审": +// score=Double.valueOf(evaluationScore) * 0.15; +// break; +// case "标准法规部高级经理审核": +// score=Double.valueOf(evaluationScore) * 0.15; +// break; +// default: score=Double.valueOf(evaluationScore); +// } +// last.add(score); +// } +// revisePlan.setScore(last.stream().mapToDouble(Double::doubleValue).sum()); + } } workbook = EsRevisePlanExportUtil.exportDatas(datas); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/controller/SarLawsInformationController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/controller/SarLawsInformationController.java index 54b6a43d..61e11b15 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/controller/SarLawsInformationController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/controller/SarLawsInformationController.java @@ -69,6 +69,9 @@ public class SarLawsInformationController extends BaseController> page(SarLawsInformation sarLawsInformation) { List rows = informationService.queryByPage(sarLawsInformation); + if (rows == null) { + return Result.error("查询失败！"); + } return Result.success(getPageInfo(sarLawsInformation.getPager(), rows)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/dao/SarLawsInformationAuthDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/dao/SarLawsInformationAuthDao.java new file mode 100644 index 00000000..264b5b97 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/dao/SarLawsInformationAuthDao.java @@ -0,0 +1,14 @@ +package com.adc.da.slrs.sarLawsInformation.dao; + +import com.adc.da.slrs.sarLawsInformation.entity.SarLawsInformationAuth; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author tjzdw + * @description + * @date 2023/11/10 + */ +@Mapper +public interface SarLawsInformationAuthDao extends BaseMapper { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java index 8883148f..c24b5639 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java @@ -37,7 +37,7 @@ public class SarLawsInformation extends BasePage implements Serializable { /** * 一级资料类别 */ - @ApiModelProperty("一级资料类别") + @ApiModelProperty("1级资料分类") @TableField(value = "FIRST_TYPE") private String firstType; @@ -45,8 +45,8 @@ public class SarLawsInformation extends BasePage implements Serializable { * 一级资料类别名称 */ @ApiModelProperty(value = "一级资料类别名称") - @TableField(exist = false) - @Excel(name = "一级资料类别", orderNum = "0") +// @TableField(exist = false) + @Excel(name = "1级资料分类", orderNum = "0") private String firstTypeName; /** @@ -60,8 +60,8 @@ public class SarLawsInformation extends BasePage implements Serializable { * 二级资料类别名称 */ @ApiModelProperty(value = "二级资料类别名称") - @TableField(exist = false) - @Excel(name = "二级资料类别", orderNum = "1") +// @TableField(exist = false) + @Excel(name = "2级资料分类", orderNum = "1") private String secondTypeName; /** @@ -75,8 +75,8 @@ public class SarLawsInformation extends BasePage implements Serializable { * 三级资料类别名称 */ @ApiModelProperty(value = "三级资料类别名称") - @TableField(exist = false) - @Excel(name = "三级资料类别", orderNum = "2") +// @TableField(exist = false) + @Excel(name = "3级资料分类", orderNum = "2") private String thirdTypeName; /** @@ -90,8 +90,8 @@ public class SarLawsInformation extends BasePage implements Serializable { * 四级资料类别名称 */ @ApiModelProperty(value = "四级资料类别名称") - @TableField(exist = false) - @Excel(name = "四级资料类别", orderNum = "3") +// @TableField(exist = false) + @Excel(name = "4级资料分类", orderNum = "3") private String fourthTypeName; /** @@ -154,21 +154,21 @@ public class SarLawsInformation extends BasePage implements Serializable { * 可查看者，若设置为空则所有用户均可查看，若设置人员后，仅有可查看者可以查看文件信息。 */ @ApiModelProperty(value = "可查看者") - @TableField(value = "VIEWABLE_BY") + @TableField(exist = false) private String viewableBy; /** * 可下载者，若设置为空则仅有上传人和审批人可以查看，若设置人员后，仅有可下载者可下载文件信息。 */ @ApiModelProperty(value = "可下载者") - @TableField(value = "DOWNLOADABLE_BY") + @TableField(exist = false) private String downloadableBy; /** * 创建人和审批人 */ @ApiModelProperty(value = "创建人和审批人") - @TableField + @TableField(exist = false) private String createAndApproveBy; /** @@ -242,4 +242,20 @@ public class SarLawsInformation extends BasePage implements Serializable { @TableField(exist = false) private static final long serialVersionUID = 1L; + + // 上传时间查询字段 + @TableField(exist = false) + private String uploadTimeBegin; + @TableField(exist = false) + private String uploadTimeEnd; + // 查询使用 所有子节点列表 + @TableField(exist = false) + private List treeNodeIdList; + + @TableField(exist = false) + private List informationIdList; + + // 是否可下载 + @TableField(exist = false) + private Boolean downloadable; } \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformationAuth.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformationAuth.java new file mode 100644 index 00000000..1181e545 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformationAuth.java @@ -0,0 +1,41 @@ +package com.adc.da.slrs.sarLawsInformation.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * @author tjzdw + * @description + * @date 2023/11/10 + */ +@TableName(value ="sar_laws_information_auth") +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@Data +public class SarLawsInformationAuth extends BaseEntity implements Serializable { + + @ApiModelProperty(value = "主键") + @TableId(value = "ID", type = IdType.ID_WORKER_STR) + private String id; + + @ApiModelProperty(value = "权限类型") + @TableField(value = "AUTH_TYPE") + private String authType; + + @ApiModelProperty(value = "政策资料ID") + @TableField(value = "LAWS_INFORMATION_ID") + private String lawsInformationId; + + @ApiModelProperty(value = "用户ID") + @TableField(value = "USER_ID") + private String userId; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/SarLawsInformationAuthService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/SarLawsInformationAuthService.java new file mode 100644 index 00000000..efebd65f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/SarLawsInformationAuthService.java @@ -0,0 +1,12 @@ +package com.adc.da.slrs.sarLawsInformation.service; + +import com.adc.da.slrs.sarLawsInformation.entity.SarLawsInformationAuth; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @author tjzdw + * @description + * @date 2023/11/10 + */ +public interface SarLawsInformationAuthService extends IService { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/SarLawsInformationService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/SarLawsInformationService.java index d2affd3e..a338297f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/SarLawsInformationService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/SarLawsInformationService.java @@ -18,7 +18,7 @@ public interface SarLawsInformationService extends IService List queryByPage(SarLawsInformation sarLawsInformation); - Integer addLawsInformation(SarLawsInformation sarLawsInformation); + Boolean addLawsInformation(SarLawsInformation sarLawsInformation); Boolean deleteInformation(String id); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationAuthServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationAuthServiceImpl.java new file mode 100644 index 00000000..24d61257 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationAuthServiceImpl.java @@ -0,0 +1,18 @@ +package com.adc.da.slrs.sarLawsInformation.service.impl; + +import com.adc.da.slrs.sarLawsInformation.dao.SarLawsInformationAuthDao; +import com.adc.da.slrs.sarLawsInformation.dao.SarLawsInformationDao; +import com.adc.da.slrs.sarLawsInformation.entity.SarLawsInformationAuth; +import com.adc.da.slrs.sarLawsInformation.service.SarLawsInformationAuthService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * @author tjzdw + * @description + * @date 2023/11/10 + */ +@Service +public class SarLawsInformationAuthServiceImpl extends ServiceImpl + implements SarLawsInformationAuthService { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java index 4cd5ecf0..072b1504 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java @@ -1,6 +1,5 @@ package com.adc.da.slrs.sarLawsInformation.service.impl; -import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.ExcelImportUtil; import cn.afterturn.easypoi.excel.entity.ImportParams; import com.adc.da.att.entity.AttFileEO; @@ -10,11 +9,12 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.person.entity.TsPersonCollect; import com.adc.da.person.service.IPersonCollectEOService; +import com.adc.da.slrs.sarLawsInformation.entity.SarLawsInformationAuth; +import com.adc.da.slrs.sarLawsInformation.service.SarLawsInformationAuthService; import com.adc.da.slrs.sarLawsInformationCenterTree.entity.SarLawsInformationCenterTree; import com.adc.da.slrs.sarLawsInformationCenterTree.service.SarLawsInformationCenterTreeService; import com.adc.da.slrs.sarUpdLog.entity.SarUpdLog; import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; -import com.adc.da.slrs.sarUser.entity.TsUser; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.slrs.tsDictionaryType.entity.TsDicType; import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService; @@ -22,7 +22,6 @@ import com.adc.da.util.LoginUserUtil; import com.adc.da.util.UUIDUtils; import com.adc.da.utils.util.FieldConvertUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.adc.da.slrs.sarLawsInformation.entity.SarLawsInformation; @@ -47,6 +46,8 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.text.SimpleDateFormat; import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import java.util.stream.Collectors; /** @@ -61,6 +62,8 @@ public class SarLawsInformationServiceImpl extends ServiceImpl 0) { sarLawsInformation.setCollectId(list.get(0).getId()); } + // 查询可查看用户和可下载用户 + String userId = LoginUserUtil.getUserId(); + LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(SarLawsInformationAuth::getLawsInformationId, sarLawsInformation.getId()); + wrapper1.eq(SarLawsInformationAuth::getAuthType, "viewableBy"); + wrapper1.select(SarLawsInformationAuth::getUserId); + List list1 = authService.list(wrapper1); + if (list1.size() > 0) { + List viewableBy = new ArrayList<>(); + list1.forEach(item -> { + String userName = userService.userIdByName(item.getUserId()); + viewableBy.add(userName + "(" + item.getUserId() + ")"); + }); + sarLawsInformation.setViewableBy(String.join(",", viewableBy)); + } + sarLawsInformation.setDownloadable(false); + LambdaQueryWrapper wrapper2 = new LambdaQueryWrapper<>(); + wrapper2.eq(SarLawsInformationAuth::getLawsInformationId, sarLawsInformation.getId()); + wrapper2.eq(SarLawsInformationAuth::getAuthType, "downloadableBy"); + wrapper2.select(SarLawsInformationAuth::getUserId); + List list2 = authService.list(wrapper2); + if (list2.size() > 0) { + List downloadableBy = new ArrayList<>(); + list2.forEach(item -> { + String userName = userService.userIdByName(item.getUserId()); + downloadableBy.add(userName + "(" + item.getUserId() + ")"); + // 判断是否可下载 + if (item.getUserId().equals(userId)) { + sarLawsInformation.setDownloadable(true); + } + }); + sarLawsInformation.setDownloadableBy(String.join(",", downloadableBy)); + } else { + sarLawsInformation.setDownloadable(true); + } + LambdaQueryWrapper wrapper3 = new LambdaQueryWrapper<>(); + wrapper3.eq(SarLawsInformationAuth::getLawsInformationId, sarLawsInformation.getId()); + wrapper3.eq(SarLawsInformationAuth::getAuthType, "createAndApproveBy"); + wrapper3.eq(SarLawsInformationAuth::getUserId, userId); + int count = authService.count(wrapper3); + if (count > 0) { + sarLawsInformation.setDownloadable(true); + } return sarLawsInformation; } @Override public List queryByPage(SarLawsInformation page) { + String userId = LoginUserUtil.getUserId(); + if (StringUtils.isBlank(userId)) { + return null; + } + // 查询有权限的资料ID + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SarLawsInformationAuth::getUserId, userId); + wrapper.eq(SarLawsInformationAuth::getAuthType, "viewableBy"); + wrapper.or().eq(SarLawsInformationAuth::getAuthType, "createAndApproveBy"); + wrapper.select(SarLawsInformationAuth::getLawsInformationId); + List informationAuthList = authService.list(wrapper); + if (informationAuthList.size() > 0) { + List informationIdList = informationAuthList.stream().map(SarLawsInformationAuth::getLawsInformationId).collect(Collectors.toList()); + page.setInformationIdList(informationIdList); + } // 设置排序字段 +// if("name".equals(page.getSortField()) || "uploadTime".equals(page.getSortField())) { +// String sortField = StringUtils.join(StringUtils.splitByCharacterTypeCamelCase(page.getSortField()),"_").toUpperCase(); +// page.setSortField(sortField); +// } if (StringUtils.isNotBlank(page.getSortField())) { String sortField = StringUtils.join(StringUtils.splitByCharacterTypeCamelCase(page.getSortField()),"_").toUpperCase(); page.setSortField(sortField); @@ -113,9 +178,17 @@ public class SarLawsInformationServiceImpl extends ServiceImpl treeNodeIdList = new ArrayList<>(); + treeService.querySubordinateTreeNode(treeNodeIdList, page.getTreeNodeId()); + page.setTreeNodeIdList(treeNodeIdList); + } Integer rowCount = this.baseMapper.queryByPageCount(page); page.getPager().setRowCount(rowCount); List sarLawsInformationList = this.baseMapper.queryByPage(page); + // 对一级类别或二级类别做排序 +// if (page.getSortField().contains("_")) for (SarLawsInformation sarLawsInformation : sarLawsInformationList) { // 将字典编号变更为字典值 convertCodeToName(sarLawsInformation); @@ -134,7 +207,7 @@ public class SarLawsInformationServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); @@ -152,7 +222,56 @@ public class SarLawsInformationServiceImpl extends ServiceImpl viewableByList = extractContentInParentheses(sarLawsInformation.getViewableBy()); + if (!viewableByList.contains(userId)) { + viewableByList.add(userId); + } + viewableByList.forEach(viewableBy -> { + SarLawsInformationAuth auth = new SarLawsInformationAuth(); + auth.setLawsInformationId(sarLawsInformation.getId()); + auth.setAuthType("viewableBy"); + auth.setUserId(viewableBy); + authService.save(auth); + }); + } + if (StringUtils.isNotBlank(sarLawsInformation.getDownloadableBy())) { + List downloadableByList = extractContentInParentheses(sarLawsInformation.getDownloadableBy()); + if (!downloadableByList.contains(userId)) { + downloadableByList.add(userId); + } + downloadableByList.forEach(viewableBy -> { + SarLawsInformationAuth auth = new SarLawsInformationAuth(); + auth.setLawsInformationId(sarLawsInformation.getId()); + auth.setAuthType("downloadableBy"); + auth.setUserId(viewableBy); + authService.save(auth); + }); + } + // 流程入库审批人和创建人入库 + if (sarLawsInformation.getCreateAndApproveBy() != null) { + for (String userIdBy : sarLawsInformation.getCreateAndApproveBy().split(",")) { + SarLawsInformationAuth auth = new SarLawsInformationAuth(); + auth.setLawsInformationId(sarLawsInformation.getId()); + auth.setAuthType("createAndApproveBy"); + auth.setUserId(userIdBy); + authService.save(auth); + } + } else { + // 配置初始人员权限 + SarLawsInformationAuth auth = new SarLawsInformationAuth(); + auth.setLawsInformationId(sarLawsInformation.getId()); + auth.setAuthType("createAndApproveBy"); + auth.setUserId(userId); + authService.save(auth); + } + return true; } @Override @@ -161,7 +280,13 @@ public class SarLawsInformationServiceImpl extends ServiceImpl wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(SarLawsInformationAuth::getLawsInformationId, id); + authService.remove(wrapper1); + } + return false; } @Override @@ -175,6 +300,36 @@ public class SarLawsInformationServiceImpl extends ServiceImpl compareResult = compareSarLawsInformation(oldLawsInformation, lawsInformation); if (compareResult.size() > 0) { int update = this.baseMapper.updateById(lawsInformation); + for (String compareItem : compareResult) { + if (compareItem.contains("可查看者")) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SarLawsInformationAuth::getLawsInformationId, lawsInformation.getId()); + wrapper.eq(SarLawsInformationAuth::getAuthType, "viewableBy"); + authService.remove(wrapper); + List viewableByList = extractContentInParentheses(lawsInformation.getViewableBy()); + viewableByList.forEach(viewableBy -> { + SarLawsInformationAuth auth = new SarLawsInformationAuth(); + auth.setLawsInformationId(lawsInformation.getId()); + auth.setAuthType("viewableBy"); + auth.setUserId(viewableBy); + authService.save(auth); + }); + } + if (compareItem.contains("可下载者")) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SarLawsInformationAuth::getLawsInformationId, lawsInformation.getId()); + wrapper.eq(SarLawsInformationAuth::getAuthType, "downloadableBy"); + authService.remove(wrapper); + List downloadableByList = extractContentInParentheses(lawsInformation.getDownloadableBy()); + downloadableByList.forEach(downloadableBy -> { + SarLawsInformationAuth auth = new SarLawsInformationAuth(); + auth.setLawsInformationId(lawsInformation.getId()); + auth.setAuthType("downloadableBy"); + auth.setUserId(downloadableBy); + authService.save(auth); + }); + } + } // 添加修改记录 SarUpdLog sarUpdLogEO = new SarUpdLog(); sarUpdLogEO.setId(UUIDUtils.randomUUID20()); @@ -193,19 +348,31 @@ public class SarLawsInformationServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.in(SarLawsInformation::getId, idList); List sarLawsInformationList = this.baseMapper.selectList(wrapper); - for (SarLawsInformation sarLawsInformation : sarLawsInformationList) { - // 将字典编号变更为字典值 - convertCodeToName(sarLawsInformation); - } +// for (SarLawsInformation sarLawsInformation : sarLawsInformationList) { +// // 将字典编号变更为字典值 +// convertCodeToName(sarLawsInformation); +// } return sarLawsInformationList; } @Override public List getAllLawsInformation(SarLawsInformation sarLawsInformation) { + String userId = LoginUserUtil.getUserId(); + // 查询有权限的资料ID + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SarLawsInformationAuth::getUserId, userId); + wrapper.eq(SarLawsInformationAuth::getAuthType, "viewableBy"); + wrapper.or().eq(SarLawsInformationAuth::getAuthType, "createAndApproveBy"); + wrapper.select(SarLawsInformationAuth::getLawsInformationId); + List informationAuthList = authService.list(wrapper); + if (informationAuthList.size() > 0) { + List informationIdList = informationAuthList.stream().map(SarLawsInformationAuth::getLawsInformationId).collect(Collectors.toList()); + sarLawsInformation.setInformationIdList(informationIdList); + } List sarLawsInformationList = this.baseMapper.getAllLawsInformation(sarLawsInformation); for (SarLawsInformation lawsInformation : sarLawsInformationList) { // 将字典编号变更为字典值 - convertCodeToName(lawsInformation); +// convertCodeToName(lawsInformation); // 查询文件信息 if (StringUtils.isNotBlank(lawsInformation.getInformationFile())) { String[] split = lawsInformation.getInformationFile().split(","); @@ -425,63 +592,70 @@ public class SarLawsInformationServiceImpl extends ServiceImpl compareSarLawsInformation(SarLawsInformation oldInfo, SarLawsInformation newInfo) { List changes = new ArrayList<>(); - // 不需要比较的字段 - String[] ignoreFields = {"id","firstTypeName","secondTypeName","thirdTypeName","fourthTypeName","uploadTime", - "informationFileList","createAndApproveBy","treeNodeId","treeNodeName","validFlag","createTime", - "modifyTime","sortField","sortMode","collectId","serialVersionUID"}; - List ignoreFieldList = Arrays.asList(ignoreFields); + // 需要比较的字段 + String[] fieldArr = {"firstType","secondType","thirdType","fourthType","name", + "department","author","description","informationFile","treeNodeId","viewableBy","downloadableBy"}; + List fieldList = Arrays.asList(fieldArr); // 获取SarLawsInformation类的所有字段 Field[] fields = SarLawsInformation.class.getDeclaredFields(); for (Field field : fields) { - if (!ignoreFieldList.contains(field.getName())) { + if (fieldList.contains(field.getName())) { try { field.setAccessible(true); String oldValue = String.valueOf(field.get(oldInfo)); String newValue = String.valueOf(field.get(newInfo)); if (!Objects.equals(oldValue, newValue)) { - if ("firstType".equals(field.getName()) || "secondType".equals(field.getName()) || "thirdType".equals(field.getName()) || - "fourthType".equals(field.getName())) { - List typeNameList = new ArrayList<>(); - if (StringUtils.isNotBlank(newValue)) { - for (String type : newValue.split(",")) { - if (StringUtils.isNotBlank(type)) { - typeNameList.add(dicTypeService.getDicTypeNameByDicCode(type)); + switch (field.getName()) { +// case "firstType": +// case "secondType": +// case "thirdType": +// case "fourthType": { +// List typeNameList = new ArrayList<>(); +// if (StringUtils.isNotBlank(newValue)) { +// for (String type : newValue.split(",")) { +// if (StringUtils.isNotBlank(type)) { +// typeNameList.add(dicTypeService.getDicTypeNameByDicCode(type)); +// } +// } +// } +// // 获取资料类型名称 +// String fieldName = field.getName().substring(0, 1).toUpperCase() + field.getName().substring(1); +// Method method = SarLawsInformation.class.getMethod("get" + fieldName + "Name"); +// Object oldTypeName = method.invoke(oldInfo); +// ApiModelProperty annotationsByType = field.getAnnotationsByType(ApiModelProperty.class)[0]; +// changes.add(annotationsByType.value() + "由\"" + oldTypeName + "\"改为\"" + String.join(",", typeNameList) + "\""); +// break; +// } + case "informationFile": { + List fileNameList = new ArrayList<>(); + if (StringUtils.isNotBlank(newValue)) { + String[] split = newValue.split(","); + for (String attId : split) { + AttFileEO fileInfo = attFileEOService.getFileInfo(attId); + fileNameList.add(fileInfo.getOldFileName()); } } - } - // 获取资料类型名称 - String fieldName = field.getName().substring(0, 1).toUpperCase() + field.getName().substring(1); - Method method = SarLawsInformation.class.getMethod("get" + fieldName + "Name"); - Object oldTypeName = method.invoke(oldInfo); - ApiModelProperty annotationsByType = field.getAnnotationsByType(ApiModelProperty.class)[0]; - changes.add(annotationsByType.value() + "由\"" + oldTypeName + "\"改为\"" + String.join(",",typeNameList) + "\""); - } else if ("informationFile".equals(field.getName())) { - List fileNameList = new ArrayList<>(); - if (StringUtils.isNotBlank(newValue)) { - String[] split = newValue.split(","); - for (String attId : split) { - AttFileEO fileInfo = attFileEOService.getFileInfo(attId); - fileNameList.add(fileInfo.getOldFileName()); + // 获取资料类型名称 + String fieldName = field.getName().substring(0, 1).toUpperCase() + field.getName().substring(1); + Method method = SarLawsInformation.class.getMethod("get" + fieldName + "List"); + List oldFileList = (List) method.invoke(oldInfo); + List oldFileNameList = new ArrayList<>(); + if (oldFileList != null && oldFileList.size() > 0) { + for (Object oldFile : oldFileList) { + AttFileEO oldFile1 = (AttFileEO) oldFile; + oldFileNameList.add(oldFile1.getOldFileName()); + } } + // 获取字段名称 + ApiModelProperty annotationsByType = field.getAnnotationsByType(ApiModelProperty.class)[0]; + changes.add(annotationsByType.value() + "由\"" + String.join(",", oldFileNameList) + "\"改为\"" + String.join(",", fileNameList) + "\""); + break; } - // 获取资料类型名称 - String fieldName = field.getName().substring(0, 1).toUpperCase() + field.getName().substring(1); - Method method = SarLawsInformation.class.getMethod("get" + fieldName + "Name"); - List oldFileList = (List)method.invoke(oldInfo); - List oldFileNameList = new ArrayList<>(); - if (oldFileList != null && oldFileList.size() > 0) { - for (Object oldFile : oldFileList) { - AttFileEO oldFile1 = (AttFileEO) oldFile; - oldFileNameList.add(oldFile1.getOldFileName()); - } + default: { + ApiModelProperty annotationsByType = field.getAnnotationsByType(ApiModelProperty.class)[0]; + changes.add(annotationsByType.value() + "由\"" + oldValue + "\"改为\"" + newValue + "\""); + break; } - // 获取字段名称 - ApiModelProperty annotationsByType = field.getAnnotationsByType(ApiModelProperty.class)[0]; - changes.add(annotationsByType.value() + "由\"" + String.join(",",oldFileNameList) + "\"改为\"" + String.join(",",fileNameList) + "\""); - } - else { - ApiModelProperty annotationsByType = field.getAnnotationsByType(ApiModelProperty.class)[0]; - changes.add(annotationsByType.value() + "由\"" + oldValue + "\"改为\"" + newValue + "\""); } } } catch (IllegalAccessException | NoSuchMethodException | InvocationTargetException e) { @@ -509,6 +683,21 @@ public class SarLawsInformationServiceImpl extends ServiceImpl extractContentInParentheses(String input) { + List results = new ArrayList<>(); + Pattern pattern = Pattern.compile("\\(([^)]+)\\)"); + Matcher matcher = pattern.matcher(input); + while (matcher.find()) { + results.add(matcher.group(1)); + } + return results; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformationCenterTree/service/SarLawsInformationCenterTreeService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformationCenterTree/service/SarLawsInformationCenterTreeService.java index a511b834..4ff24cac 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformationCenterTree/service/SarLawsInformationCenterTreeService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformationCenterTree/service/SarLawsInformationCenterTreeService.java @@ -22,4 +22,6 @@ public interface SarLawsInformationCenterTreeService extends IService getTree(); boolean updateTreeNode(SarLawsInformationCenterTree informationCenterTree); + + void querySubordinateTreeNode(List treeNodeIdList, String treeNodeId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformationCenterTree/service/impl/SarLawsInformationCenterTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformationCenterTree/service/impl/SarLawsInformationCenterTreeServiceImpl.java index 016db49c..36d19867 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformationCenterTree/service/impl/SarLawsInformationCenterTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformationCenterTree/service/impl/SarLawsInformationCenterTreeServiceImpl.java @@ -101,6 +101,20 @@ public class SarLawsInformationCenterTreeServiceImpl extends ServiceImpl 0; } + // 递归查询所有子节点 + @Override + public void querySubordinateTreeNode(List treeNodeIdList, String treeNodeId) { + treeNodeIdList.add(treeNodeId); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SarLawsInformationCenterTree::getParentId, treeNodeId); + List list = list(wrapper); + if (list.size()>0) { + for (SarLawsInformationCenterTree sarLawsInformationCenterTree : list) { + querySubordinateTreeNode(treeNodeIdList,sarLawsInformationCenterTree.getId()); + } + } + } + @Transactional @Override public void setResource(SarLawsInformationCenterTree informationCenterTree) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/controller/SarLawsTopicController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/controller/SarLawsTopicController.java index 1f06ca25..d2f908f0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/controller/SarLawsTopicController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/controller/SarLawsTopicController.java @@ -76,24 +76,24 @@ public class SarLawsTopicController extends BaseController { @ApiOperation(value = "新增政策课题") @PostMapping(value = "/addLawsTopic", consumes = "application/json;charset=UTF-8") - public ResponseMessage create(@RequestBody SarLawsTopic lawsTopic) throws Exception { + public ResponseMessage addLawsTopic(@RequestBody SarLawsTopic lawsTopic) throws Exception { lawsTopicService.addLawsTopicInfo(lawsTopic); return Result.success(); } - @ApiOperation("根据会议ID删除会议") + @ApiOperation("根据政策课题id删除课题") @DeleteMapping("/deleteLawsTopicById") - public ResponseMessage deleteMeeting(String lawsTopicId) { - if (StringUtils.isBlank(lawsTopicId)) { + public ResponseMessage deleteLawsTopicById(String id) { + if (StringUtils.isBlank(id)) { return Result.error("删除失败，政策课题ID为空"); } - lawsTopicService.deleteLawsTopicInfo(lawsTopicId); + lawsTopicService.deleteLawsTopicInfo(id); return Result.success(); } - @ApiOperation("根据会议ID修改会议信息") + @ApiOperation("根据政策课题ID修改课题信息") @PutMapping("/updateLawsTopicInfo") - public ResponseMessage updateMeetingInfo(@RequestBody SarLawsTopic lawsTopic) { + public ResponseMessage updateLawsTopicInfo(@RequestBody SarLawsTopic lawsTopic) { if (ObjectUtils.isEmpty(lawsTopic)) { return Result.error("更新失败，政策课题信息不存在"); } @@ -178,7 +178,7 @@ public class SarLawsTopicController extends BaseController { HSSFCellStyle cellStyle1 = workbook.createCellStyle(); cellStyle1.setAlignment(HorizontalAlignment.CENTER); cellStyle1.setVerticalAlignment(VerticalAlignment.CENTER); - String exportFieldName = "课题名称,课题承办单位,课题指导单位,课题参与单位,开始时间,结题时间,课题费用（万元）"; + String exportFieldName = "课题名称,课题承办单位,课题指导单位,课题参与单位,启动时间,结题时间,课题费用（万元）"; String[] headerArr = exportFieldName.split(","); for (int i=0;i < headerArr.length; i++) { Cell cell = rowHeader.createCell(i); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/dao/SarLawsTopicMapper.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/dao/SarLawsTopicMapper.java index ddbd8f2b..62169489 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/dao/SarLawsTopicMapper.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/dao/SarLawsTopicMapper.java @@ -17,7 +17,7 @@ import java.util.List; @Mapper public interface SarLawsTopicMapper extends BaseMapper { - Integer queryByPageCount(SarLawsTopicVO page); + List queryByPageCount(SarLawsTopicVO page); List queryByPage(SarLawsTopicVO page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java index 9ceb0cff..de104c22 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java @@ -58,7 +58,7 @@ public class SarLawsTopic implements Serializable { /** * 开始时间 */ - @ApiModelProperty(value = "开始时间") + @ApiModelProperty(value = "启动时间") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @TableField(value = "START_TIME") private Date startTime; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicVO.java index ecc187da..9ac842d3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicVO.java @@ -56,7 +56,7 @@ public class SarLawsTopicVO extends BasePage { */ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") - @Excel(name = "开始时间", orderNum = "4", exportFormat = "yyyy-MM-dd", needMerge = true) + @Excel(name = "启动时间", orderNum = "4", exportFormat = "yyyy-MM-dd", needMerge = true) private Date startTime; /** @@ -238,8 +238,9 @@ public class SarLawsTopicVO extends BasePage { private String sortMode = "asc"; - private String startTimeOperator = "="; - private String closeTimeOperator = "="; + // 排序字段 + private Date startTimeBegin; + private Date startTimeEnd; // 导出使用的属性 // 导出文件名 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java index 7e94b4ad..c8fad2fb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java @@ -217,7 +217,7 @@ public class SarLawsTopicServiceImpl extends ServiceImpl sarLawsTopicVOList = this.baseMapper.queryByPage(page); for (SarLawsTopicVO lawsTopicVO : sarLawsTopicVOList) { @@ -414,14 +414,16 @@ public class SarLawsTopicServiceImpl extends ServiceImpl fileNameList = new ArrayList<>(); - if (StringUtils.isNotBlank(newValue)) { - String[] split = newValue.split(","); + if (StringUtils.isNotBlank(newValueStr)) { + String[] split = newValueStr.split(","); for (String attId : split) { AttFileEO fileInfo = attFileEOService.getFileInfo(attId); fileNameList.add(fileInfo.getOldFileName()); @@ -447,7 +449,21 @@ public class SarLawsTopicServiceImpl extends ServiceImpl attrInfoMap = new HashMap<>(); for (SarStandAttrDetails detailsEO : detailsEOList) { if (!InitStandAttrUtil.fileFieldListBuss.contains(detailsEO.getAttrField())) { - attrBud.append(detailsEO.getAttrName() + ","); attrInfoMap.put(detailsEO.getAttrName(),detailsEO.getAttrField()); + if ("关联流程".equals(detailsEO.getAttrName())) { + continue; + } + attrBud.append(detailsEO.getAttrName() + ","); } } String header = FieldConvertUtil.exportBaseFieldNamesBuss + "," + attrBud.toString(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java index 77b17ad3..1d63b5c6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java @@ -33,9 +33,15 @@ public class FieldConvertUtil { public static String exportBaseFieldNames = "标准体系,是否纳入认证清单,标准性质,标准类别,标准编号,标准年份,中文名称,英文名称," + "文本状态,发布日期"; // 导出基础表字段 //删除 实施日期 2021-05-28 + public static String exportBaseFieldNewNames = "标准编号,中文名称,英文名称,标准体系," + + "文本状态,发布日期,标准性质"; // 导出基础表字段 // 删除是否纳入认证清单，删除 标准类别 标准编号 标准年份 ，统一为标准编号 2023-11-13 + public static String exportBaseFieldNamesForeign = "标准类别,标准编号,标准年份,中文名称,英文名称," + "文本状态,发布日期,是否纳入认证清单,标准体系,适用认证,能源类型";// 导出基础表字段 + public static String exportBaseFieldNamesNewForeign = "标准编号,中文名称,英文名称," + + "文本状态,发布日期,是否纳入认证清单,标准体系,适用认证,能源类型";// 导出基础表字段 //删除 标准类别 标准编号 标准年份 ，统一为标准编号 2023-11-13 + public static String exportAttrFieldNamesInland = "归口管理部门,发布机构,工作组信息,我司参与深度,适用车辆类型,要求类型," + "标签,发布稿（必读）,增补件（必读）,报批稿,送审稿,征求意见稿,草案,相关资料,新车型实施日期（文本）,在产车实施日期（文本）," + "EOP实施日期（文本）,责任部门,相关部门,SVPPS,FO,项目评估角色,法规维护人,代替标准编号," + @@ -64,7 +70,7 @@ public class FieldConvertUtil { public static String exportFieldNamesMeetingTopic = "议题名称,汇报人,汇报单位,议题主要内容"; // 政策法规资料 表头 - public static String exportFieldLawsInformation = "一级资料类别,二级资料类别,三级资料类别,四级资料类别,资料名称,资料归属部门,作者,资料说明"; + public static String exportFieldLawsInformation = "1级资料分类,2级资料分类,3级资料分类,4级资料分类,资料名称,资料归属部门,作者,资料说明"; // 政策课题 表头 public static String exportFieldLawsTopic = "课题名称,课题承办单位,课题指导单位,课题参与单位,开始时间,结题时间,课题费用（万元）,课题组会议列表,课题组联系方式,内部联系方式"; diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java index 3a9ae643..e7aecc4e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java @@ -39,17 +39,21 @@ public class StandExportUtil { } for (SarStandAttrDetails detailsEO : detailsEOList) { if (!InitStandAttrUtil.fileFieldList.contains(detailsEO.getAttrField())) { - attrBud.append(detailsEO.getAttrName() + ","); attrInfoMap.put(detailsEO.getAttrName(),detailsEO.getAttrField()); + // 去掉 参会记录 和 相关流程 两个导出字段 2023-11-13 + if("参会记录".equals(detailsEO.getAttrName()) || "相关流程".equals(detailsEO.getAttrName())) { + continue; + } + attrBud.append(detailsEO.getAttrName() + ","); } } - String header = FieldConvertUtil.exportBaseFieldNames + "," + attrBud.toString(); + String header = FieldConvertUtil.exportBaseFieldNewNames + "," + attrBud.toString(); //国内导出去掉体系类别 if (SarTypeEnum.INLAND_STAND.getValue().equals(standType)) { header = header.replace(",体系类别",""); } if (SarTypeEnum.FOREIGN_STAND.getValue().equals(standType)) { - header = FieldConvertUtil.exportBaseFieldNamesForeign + "," + attrBud.toString(); + header = FieldConvertUtil.exportBaseFieldNamesNewForeign + "," + attrBud.toString(); } //创建工作表对象 Sheet sheet = workbook.createSheet(); @@ -125,9 +129,9 @@ public class StandExportUtil { case "适用区域": value = verifyBean(sarStandardsInfoEO.getCountryShow()); break; - case "标准类别": - value = verifyBean(sarStandardsInfoEO.getStandSortShow()); - break; +// case "标准类别": +// value = verifyBean(sarStandardsInfoEO.getStandSortShow()); +// break; case "重要度": if (StringUtils.isNotBlank(sarStandardsInfoEO.getIsRelateAccess())) { if ("1".equals(sarStandardsInfoEO.getIsRelateAccess())) { @@ -138,11 +142,14 @@ public class StandExportUtil { } value = sarStandardsInfoEO.getIsRelateAccess(); break; +// case "标准编号": +// value = verifyBean(sarStandardsInfoEO.getStandNumber()); +// break; +// case "标准年份": +// value = verifyBean(sarStandardsInfoEO.getStandYear()); +// break; case "标准编号": - value = verifyBean(sarStandardsInfoEO.getStandNumber()); - break; - case "标准年份": - value = verifyBean(sarStandardsInfoEO.getStandYear()); + value = sarStandardsInfoEO.getStandCode(); break; case "中文名称": value = verifyBean(sarStandardsInfoEO.getStandName()); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml index 5d069c4e..eb48940c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml @@ -50,8 +50,8 @@ and MEETING_ORGANIZER like concat('%',#{meetingOrganizer},'%') - - and MEETING_TIME ${meetingTimeOperator} #{meetingTime} + + and MEETING_TIME between #{meetingTimeBegin} and #{meetingTimeEnd} and MEETING_ADDRESS like concat('%',#{meetingAddress},'%') @@ -88,10 +88,11 @@ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml index 606e448c..6980ed91 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml @@ -114,11 +114,8 @@ and PARTICIPATING_UNIT like concat('%',#{participatingUnit},'%') - - and START_TIME ${startTimeOperator} #{startTime} - - - and CLOSE_TIME ${startTimeOperator} #{closeTime} + + and START_TIME between #{startTimeBegin} and ${startTimeEnd} and TOPIC_STATUS = #{topicStatus} @@ -185,13 +182,14 @@