diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index be7c405b..7a7db19f 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -138,7 +138,7 @@ stand.edit.file.path = /data/slrs/file/ file.downloadUrl=https://srms.foton.com.cn/file/ #上传文件白名单-以,分隔 -upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt +upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt,pdg # ============================================================================= # elasticsearch 配置 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/importExcelDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/importExcelDTO.java index 1eb26d04..aedda55a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/importExcelDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/importExcelDTO.java @@ -17,9 +17,10 @@ public class importExcelDTO { @Excel(name = "制修订类型",orderNum = "2", width = 20.0) private String reviseStatus; + @Excel(name = "起草责任单位" , orderNum = "3", width = 20.0) private String unitName; - @Excel(name = "起草责任单位" , orderNum = "3", width = 20.0) + private String unit; private String drafterName; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java index bc529903..675a4bf6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java @@ -73,9 +73,9 @@ public class IExportServiceImpl implements IExportService { stringBuilder.append("第" + i + "行第7列工作组组长填写不符合格式要求请检查；"); } } - if (null!=importExcelDTO.getUnit() && !"".equals(importExcelDTO.getUnit())){ - importExcelDTO.setUnitName(tsInstitutionMap.get(importExcelDTO.getUnit())); - if (null==tsInstitutionMap.get(importExcelDTO.getUnit())){ + if (null!=importExcelDTO.getUnitName() && !"".equals(importExcelDTO.getUnitName())){ + importExcelDTO.setUnit(tsInstitutionMap.get(importExcelDTO.getUnitName())); + if (null==tsInstitutionMap.get(importExcelDTO.getUnitName())){ stringBuilder.append("第"+i+"行第4列起草责任单位填写不符合格式要求请检查；"); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index f1f6644e..1215f68f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -61,6 +61,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.sql.Clob; +import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -550,18 +551,30 @@ public class SarBussionessStandServiceImpl extends ServiceImpl children = iTsResourceService.list(qw); if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ - List getMenuIdList = tsUserService.getResourceUserId(userId); - if (!getMenuIdList.isEmpty()) { - page.setMenuRoleList(getMenuIdList); - } else { - page.setMenuRoleList(null); - } +// List getMenuIdList = tsUserService.getResourceUserId(userId); +// if (!getMenuIdList.isEmpty()) { +// page.setMenuRoleList(getMenuIdList); +// } else { +// page.setMenuRoleList(null); +// } List ids = iTsResourceService.getChildMenuList(page.getMenuId()); if (ids != null && !ids.isEmpty()) { page.setMenuAllChildrenIdList(ids); @@ -180,12 +180,12 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl children = iTsResourceService.list(qw); if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ - List getMenuIdList = tsUserService.getResourceUserId(userId); - if (!getMenuIdList.isEmpty()) { - page.setMenuRoleList(getMenuIdList); - } else { - page.setMenuRoleList(null); - } +// List getMenuIdList = tsUserService.getResourceUserId(userId); +// if (!getMenuIdList.isEmpty()) { +// page.setMenuRoleList(getMenuIdList); +// } else { +// page.setMenuRoleList(null); +// } List ids = iTsResourceService.getChildMenuList(userId); if (ids != null && !ids.isEmpty()) { page.setMenuAllChildrenIdList(ids); @@ -429,12 +429,12 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl children = iTsResourceService.list(qw); 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 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); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/controller/TsPositionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/controller/TsPositionController.java index 27a9477f..752a43ba 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/controller/TsPositionController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/controller/TsPositionController.java @@ -1,77 +1,77 @@ -package com.adc.da.slrs.sarPosition.controller; - - -import com.adc.da.http.ResponseMessage; -import com.adc.da.http.Result; -import com.adc.da.slrs.sarPosition.entity.TsPositionRoleVO; -import com.adc.da.slrs.sarPosition.service.ITsPositionService; -import com.adc.da.slrs.sarRole.entity.TsRole; -import com.baomidou.mybatisplus.core.metadata.IPage; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import com.adc.da.slrs.sarPosition.entity.TsPosition; -import io.swagger.annotations.Api; -import com.adc.da.base.web.BaseController; - -import javax.validation.Valid; -import java.util.List; - -/** -*

- * 前端控制器 - *

-* -* @author zyl -* @since 2021-06-23 -*/ -@RestController -@Api(tags = "|岗位管理|") -@RequestMapping("/api/sarPosition/position") -public class TsPositionController extends BaseController { - @Autowired - private ITsPositionService tsPositionService; - - /** - * 查询岗位（可通过name筛选） - * @param tsPosition：筛选信息 - */ - @ApiOperation("查询岗位") - @GetMapping - public ResponseMessage> getPosition(TsPosition tsPosition){ - IPage positions=tsPositionService.getPosition(tsPosition); - return Result.success(positions); - } - - @ApiOperation("新增岗位") - @PostMapping - public ResponseMessage addPosition(@Validated(TsPosition.insert.class) TsPosition tsPosition){ - return tsPositionService.addPosition(tsPosition); - } - - @ApiOperation("配置角色") - @PostMapping("/role") - public ResponseMessage> setRole(@Valid @RequestBody TsPositionRoleVO tsPositionRoleVO){ - return tsPositionService.setRole(tsPositionRoleVO); - } - - @ApiOperation("查询角色") - @GetMapping("/role") - public ResponseMessage> getRole(@RequestParam String positionId){ - List roles=tsPositionService.getRole(positionId); - return Result.success(roles); - } - - @ApiOperation("编辑岗位") - @PutMapping - public ResponseMessage updatePosition(@Validated(TsPosition.update.class) TsPosition tsPosition){ - return tsPositionService.updatePosition(tsPosition); - } - - @ApiOperation("删除岗位") - @DeleteMapping - public ResponseMessage deletePosition(@RequestParam String positionId){ - return tsPositionService.deletePosition(positionId); - } -} +package com.adc.da.slrs.sarPosition.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarPosition.entity.TsPositionRoleVO; +import com.adc.da.slrs.sarPosition.service.ITsPositionService; +import com.adc.da.slrs.sarRole.entity.TsRole; +import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import com.adc.da.slrs.sarPosition.entity.TsPosition; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import javax.validation.Valid; +import java.util.List; + +/** +*

+ * 前端控制器 + *

+* +* @author zyl +* @since 2021-06-23 +*/ +@RestController +@Api(tags = "|岗位管理|") +@RequestMapping("/api/sarPosition/position") +public class TsPositionController extends BaseController { + @Autowired + private ITsPositionService tsPositionService; + + /** + * 查询岗位（可通过name筛选） + * @param tsPosition：筛选信息 + */ + @ApiOperation("查询岗位") + @GetMapping + public ResponseMessage> getPosition(TsPosition tsPosition){ + IPage positions=tsPositionService.getPosition(tsPosition); + return Result.success(positions); + } + + @ApiOperation("新增岗位") + @PostMapping + public ResponseMessage addPosition(@Validated(TsPosition.insert.class) TsPosition tsPosition){ + return tsPositionService.addPosition(tsPosition); + } + + @ApiOperation("配置角色") + @PostMapping("/role") + public ResponseMessage> setRole(@Valid @RequestBody TsPositionRoleVO tsPositionRoleVO){ + return tsPositionService.setRole(tsPositionRoleVO); + } + + @ApiOperation("查询角色") + @GetMapping("/role") + public ResponseMessage> getRole(@RequestParam String positionId){ + List roles=tsPositionService.getRole(positionId); + return Result.success(roles); + } + + @ApiOperation("编辑岗位") + @PutMapping + public ResponseMessage updatePosition(@Validated(TsPosition.update.class) TsPosition tsPosition){ + return tsPositionService.updatePosition(tsPosition); + } + + @ApiOperation("删除岗位") + @DeleteMapping + public ResponseMessage deletePosition(@RequestParam String positionId){ + return tsPositionService.deletePosition(positionId); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPosition.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPosition.java index 0dbcde78..e703aaf8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPosition.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPosition.java @@ -1,95 +1,97 @@ -package com.adc.da.slrs.sarPosition.entity; - -import com.adc.da.base.entity.BaseEntity; - -import java.sql.Timestamp; -import java.time.LocalDateTime; -import java.util.List; - -import com.adc.da.slrs.sarRole.entity.TsRole; -import com.adc.da.slrs.sarUser.entity.TsUser; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import javax.validation.constraints.NotNull; - -/** - *

- * - *

- * - * @author zyl - * @since 2021-06-23 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@ApiModel(value="TsPosition对象", description="") -public class TsPosition extends BaseEntity { - public interface insert{ - } - public interface update{ - } - - private static final long serialVersionUID = 1L; - - - @ApiModelProperty(value = "操作时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Timestamp operateTime; - - @ApiModelProperty(value = "操作人") - private String operator; - - @NotNull(message = "name不能为空",groups = {insert.class}) - @ApiModelProperty(value = "岗位名称") - private String name; - - @ApiModelProperty(value = "创建部门ID") - private String createDeptId; - - @ApiModelProperty(value = "创建人ID") - private String createById; - - @ApiModelProperty(value = "类型(1为导入，2为新建）") - private String type; - - @NotNull(message = "id不能为空",groups = {update.class}) - @ApiModelProperty(value = "ID") - @TableId(value = "id",type = IdType.UUID) - private String id; - - @ApiModelProperty(value = "绑定角色") - @TableField(exist = false) - private List roles; - - @TableField(exist = false) - private List tsUser; - - @ApiModelProperty(value = "操作人中文") - @TableField(exist = false) - private String uname; - - @ApiModelProperty(value = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Timestamp createTime; - - @TableField(exist = false) - private Integer current; - - @TableField(exist = false) - private Integer pageSize; - - @TableField(exist = false) - private Integer total; -} +package com.adc.da.slrs.sarPosition.entity; + +import com.adc.da.base.entity.BaseEntity; + +import java.sql.Timestamp; +import java.time.LocalDateTime; +import java.util.List; + +import com.adc.da.slrs.sarRole.entity.TsRole; +import com.adc.da.slrs.sarUser.entity.TsUser; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; + +/** + *

+ * + *

+ * + * @author zyl + * @since 2021-06-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="TsPosition对象", description="") +public class TsPosition extends BaseEntity { + public interface insert{ + } + public interface update{ + } + + private static final long serialVersionUID = 1L; + + + @ApiModelProperty(value = "操作时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Timestamp operateTime; + + @ApiModelProperty(value = "操作人") + private String operator; + + @NotNull(message = "name不能为空",groups = {insert.class}) + @ApiModelProperty(value = "岗位名称") + private String name; + + @ApiModelProperty(value = "创建部门ID") + private String createDeptId; + + @ApiModelProperty(value = "创建人ID") + private String createById; + + @ApiModelProperty(value = "类型(1为导入，2为新建）") + private String type; + + @NotNull(message = "id不能为空",groups = {update.class}) + @ApiModelProperty(value = "ID") + @TableId(value = "id",type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "绑定角色") + @TableField(exist = false) + private List roles; + + @TableField(exist = false) + private List tsUser; + + @ApiModelProperty(value = "操作人中文") + @TableField(exist = false) + private String uname; + + @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Timestamp createTime; + + @TableField(exist = false) + private Integer current; + + @TableField(exist = false) + private Integer pageSize; + + @TableField(exist = false) + private Integer total; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPositionRoleVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPositionRoleVO.java index da7bf94b..ffb088e4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPositionRoleVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPositionRoleVO.java @@ -1,15 +1,17 @@ -package com.adc.da.slrs.sarPosition.entity; - -import com.adc.da.slrs.sarRole.entity.TsRole; -import lombok.Data; - -import javax.validation.constraints.NotNull; -import java.util.List; - -@Data -public class TsPositionRoleVO { - @NotNull(message = "positionId不能为空") - private String positionId; - @NotNull(message = "roleIds不能为空") - private List roleIds; -} +package com.adc.da.slrs.sarPosition.entity; + +import com.adc.da.slrs.sarRole.entity.TsRole; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +@Data +public class TsPositionRoleVO { + @NotNull(message = "positionId不能为空") + private String positionId; + @NotNull(message = "roleIds不能为空") + private List roleIds; + + private String operator; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/ITsPositionService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/ITsPositionService.java index cf4a653c..6089e2b4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/ITsPositionService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/ITsPositionService.java @@ -1,77 +1,77 @@ -package com.adc.da.slrs.sarPosition.service; - -import com.adc.da.http.ResponseMessage; -import com.adc.da.slrs.sarPosition.entity.TsPosition; -import com.adc.da.slrs.sarPosition.entity.TsPositionRoleVO; -import com.adc.da.slrs.sarRole.entity.TsRole; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.util.List; - -/** - *

- * 服务类 - *

- * - * @author zyl - * @since 2021-06-23 - */ -public interface ITsPositionService extends IService { - - /** - * 查询岗位 - * @param tsPosition：查询信息 - * @return List - */ - IPage getPosition(TsPosition tsPosition); - - /** - * 配置角色 - * @param tsPositionRoleVO ：角色ID - * @return ResponseMessage - */ - ResponseMessage> setRole(TsPositionRoleVO tsPositionRoleVO); - - /** - * 查询角色 - * @param positionId ：岗位ID - * @return List - */ - List getRole(String positionId); - - /** - * 添加岗位 - * @param tsPosition：岗位信息 - * @return ResponseMessage - */ - ResponseMessage addPosition(TsPosition tsPosition); - - /** - * 修改岗位 - * @param tsPosition：岗位信息 - * @return ResponseMessage - */ - ResponseMessage updatePosition(TsPosition tsPosition); - - /** - * 删除岗位 - * @param positionId：岗位ID - * @return ResponseMessage - */ - ResponseMessage deletePosition(String positionId); - - /** - * 通过岗位列表查询绑定的角色列表 - * @param positionIds：岗位列表 - * @return List - */ - List getRoleIdsByPositionIds(List positionIds); - - /** - * 通过roleId查询岗位ID列表 - * @param roleId：角色ID - * @return List - */ - List getPositionIdsByRoleId(String roleId); -} +package com.adc.da.slrs.sarPosition.service; + +import com.adc.da.http.ResponseMessage; +import com.adc.da.slrs.sarPosition.entity.TsPosition; +import com.adc.da.slrs.sarPosition.entity.TsPositionRoleVO; +import com.adc.da.slrs.sarRole.entity.TsRole; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author zyl + * @since 2021-06-23 + */ +public interface ITsPositionService extends IService { + + /** + * 查询岗位 + * @param tsPosition：查询信息 + * @return List + */ + IPage getPosition(TsPosition tsPosition); + + /** + * 配置角色 + * @param tsPositionRoleVO ：角色ID + * @return ResponseMessage + */ + ResponseMessage> setRole(TsPositionRoleVO tsPositionRoleVO); + + /** + * 查询角色 + * @param positionId ：岗位ID + * @return List + */ + List getRole(String positionId); + + /** + * 添加岗位 + * @param tsPosition：岗位信息 + * @return ResponseMessage + */ + ResponseMessage addPosition(TsPosition tsPosition); + + /** + * 修改岗位 + * @param tsPosition：岗位信息 + * @return ResponseMessage + */ + ResponseMessage updatePosition(TsPosition tsPosition); + + /** + * 删除岗位 + * @param positionId：岗位ID + * @return ResponseMessage + */ + ResponseMessage deletePosition(String positionId); + + /** + * 通过岗位列表查询绑定的角色列表 + * @param positionIds：岗位列表 + * @return List + */ + List getRoleIdsByPositionIds(List positionIds); + + /** + * 通过roleId查询岗位ID列表 + * @param roleId：角色ID + * @return List + */ + List getPositionIdsByRoleId(String roleId); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java index 0f7a1116..d912d7a3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java @@ -1,182 +1,194 @@ -package com.adc.da.slrs.sarPosition.service.impl; - -import com.adc.da.http.ResponseMessage; -import com.adc.da.http.Result; -import com.adc.da.slrs.sarPosition.entity.TsPosition; -import com.adc.da.slrs.sarPosition.dao.TsPositionDao; -import com.adc.da.slrs.sarPosition.entity.TsPositionRoleVO; -import com.adc.da.slrs.sarPosition.service.ITsPositionService; -import com.adc.da.slrs.sarRole.entity.TsRole; -import com.adc.da.utils.util.ListUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.management.relation.Role; -import javax.xml.crypto.Data; -import java.sql.Timestamp; -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** - *

- * 服务实现类 - *

- * - * @author zyl - * @since 2021-06-23 - */ -@Service -public class TsPositionServiceImpl extends ServiceImpl implements ITsPositionService { - @Autowired - private TsPositionDao tsPositionDao; - - /** - * 查询岗位 - * @param tsPosition：查询信息 - * @return List - */ - @Override - public IPage getPosition(TsPosition tsPosition) { - IPage page=new Page(); -// page.setTotal(tsPositionDao.pageTotal()); - page.setTotal(tsPositionDao.countPositionAndRole(tsPosition)); - List list = tsPositionDao.selectPositionAndRole(tsPosition); - for (TsPosition tsPositions:list){ - tsPositions.getTsUser().forEach(res->{ - tsPositions.setOperator(res.getUname()); - }); - } - page.setRecords(list); - page.setTotal(page.getTotal()); - page.setCurrent(tsPosition.getCurrent()); - page.setSize(tsPosition.getPageSize()); - System.out.println(page.getTotal()); - - return page; - } - - /** - * 配置角色 - * @param tsPositionRoleVO ：角色ID - * @return ResponseMessage - */ - @Override - @Transactional - public ResponseMessage> setRole(TsPositionRoleVO tsPositionRoleVO) { - TsPosition position=tsPositionDao.selectById(tsPositionRoleVO.getPositionId()); - if(position==null){ - return Result.error("该岗位不存在"); - } - List oldRoleIds=tsPositionDao.getRoleId(tsPositionRoleVO.getPositionId()); - Map> updateRoleIds= ListUtil.difList(tsPositionRoleVO.getRoleIds(),oldRoleIds); - List insertIds=updateRoleIds.get("insert"); - List deleteIds=updateRoleIds.get("delete"); - for(String id:insertIds){ - tsPositionDao.insertRole(tsPositionRoleVO.getPositionId(),id); - } - for(String id:deleteIds){ - tsPositionDao.deleteRole(tsPositionRoleVO.getPositionId(),id); - } - List roles=getRole(tsPositionRoleVO.getPositionId()); - return Result.success(roles); - } - - /** - * 查询角色 - * @param positionId ：岗位ID - * @return List - */ - @Override - public List getRole(String positionId) { - return tsPositionDao.getRole(positionId); - } - - /** - * 添加岗位 - * @param tsPosition：岗位信息 - * @return ResponseMessage - */ - @Override - public ResponseMessage addPosition(TsPosition tsPosition) { - QueryWrapper positionQueryWrapper=new QueryWrapper<>(); - positionQueryWrapper.eq("name",tsPosition.getName()); - List tsPositions=tsPositionDao.selectList(positionQueryWrapper); - if(tsPositions!=null&&tsPositions.size()>0){ - return Result.error("该岗位已存在"); - } - //设置操作时间为当前系统时间 - tsPosition.setOperateTime(new Timestamp(System.currentTimeMillis())); - tsPosition.setType("2"); - tsPositionDao.insert(tsPosition); - return Result.success(); - } - - /** - * 修改岗位 - * @param tsPosition：岗位信息 - * @return ResponseMessage - */ - @Override - public ResponseMessage updatePosition(TsPosition tsPosition) { - TsPosition oldPosition=tsPositionDao.selectById(tsPosition.getId()); - if(oldPosition==null){ - return Result.error("该岗位不存在"); - } - if(!oldPosition.getType().equals("2")){ - return Result.error("该岗位不可修改"); - } - tsPositionDao.updateById(tsPosition); - return Result.success(); - } - - /** - * 删除岗位 - * @param positionId：岗位ID - * @return ResponseMessage - */ - @Override - public ResponseMessage deletePosition(String positionId) { - TsPosition oldPosition=tsPositionDao.selectById(positionId); - if(oldPosition==null){ - return Result.error("该岗位不存在"); - } - if(!oldPosition.getType().equals("2")){ - return Result.error("该岗位不可删除"); - } - List roleIds=tsPositionDao.getRoleId(positionId); - if(roleIds!=null&&roleIds.size()>0){ - return Result.error("该岗位已绑定角色，无法删除"); - } - tsPositionDao.deleteById(positionId); - return Result.success(); - } - - /** - * 通过岗位列表查询绑定的角色列表 - * @param positionIds：岗位列表 - * @return List - */ - @Override - public List getRoleIdsByPositionIds(List positionIds) { - if(positionIds!=null&&positionIds.size()>0){ - return tsPositionDao.getRoleIdsByPositionIds(positionIds); - } - return null; - } - - /** - * 通过roleId查询岗位ID列表 - * @param roleId：角色ID - * @return List - */ - @Override - public List getPositionIdsByRoleId(String roleId) { - return tsPositionDao.getPositionIdsByRoleId(roleId); - } -} +package com.adc.da.slrs.sarPosition.service.impl; + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarPosition.entity.TsPosition; +import com.adc.da.slrs.sarPosition.dao.TsPositionDao; +import com.adc.da.slrs.sarPosition.entity.TsPositionRoleVO; +import com.adc.da.slrs.sarPosition.service.ITsPositionService; +import com.adc.da.slrs.sarRole.entity.TsRole; +import com.adc.da.utils.util.ListUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.management.relation.Role; +import javax.xml.crypto.Data; +import java.sql.Timestamp; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + *

+ * 服务实现类 + *

+ * + * @author zyl + * @since 2021-06-23 + */ +@Service +public class TsPositionServiceImpl extends ServiceImpl implements ITsPositionService { + @Autowired + private TsPositionDao tsPositionDao; + + /** + * 查询岗位 + * @param tsPosition：查询信息 + * @return List + */ + @Override + public IPage getPosition(TsPosition tsPosition) { + IPage page=new Page(); +// page.setTotal(tsPositionDao.pageTotal()); + page.setTotal(tsPositionDao.countPositionAndRole(tsPosition)); + List list = tsPositionDao.selectPositionAndRole(tsPosition); + for (TsPosition tsPositions:list){ + tsPositions.getTsUser().forEach(res->{ + tsPositions.setOperator(res.getUname()); + }); + } + page.setRecords(list); + page.setTotal(page.getTotal()); + page.setCurrent(tsPosition.getCurrent()); + page.setSize(tsPosition.getPageSize()); + System.out.println(page.getTotal()); + + return page; + } + + /** + * 配置角色 + * @param tsPositionRoleVO ：角色ID + * @return ResponseMessage + */ + @Override + @Transactional + public ResponseMessage> setRole(TsPositionRoleVO tsPositionRoleVO) { + TsPosition position=tsPositionDao.selectById(tsPositionRoleVO.getPositionId()); + if(position==null){ + return Result.error("该岗位不存在"); + } + List oldRoleIds=tsPositionDao.getRoleId(tsPositionRoleVO.getPositionId()); + Map> updateRoleIds= ListUtil.difList(tsPositionRoleVO.getRoleIds(),oldRoleIds); + List insertIds=updateRoleIds.get("insert"); + List deleteIds=updateRoleIds.get("delete"); + TsPosition tsPosition = new TsPosition(); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + for(String id:insertIds){ + tsPositionDao.insertRole(tsPositionRoleVO.getPositionId(),id); + updateWrapper.eq("id", tsPositionRoleVO.getPositionId()); + tsPosition.setOperateTime(new Timestamp(System.currentTimeMillis())); + tsPosition.setOperator(tsPositionRoleVO.getOperator()); + baseMapper.update(tsPosition,updateWrapper); + } + for(String id:deleteIds){ + tsPositionDao.deleteRole(tsPositionRoleVO.getPositionId(),id); + updateWrapper.eq("id", tsPositionRoleVO.getPositionId()); + tsPosition.setOperateTime(new Timestamp(System.currentTimeMillis())); + tsPosition.setOperator(tsPositionRoleVO.getOperator()); + baseMapper.update(tsPosition,updateWrapper); + } + List roles=getRole(tsPositionRoleVO.getPositionId()); + return Result.success(roles); + } + + /** + * 查询角色 + * @param positionId ：岗位ID + * @return List + */ + @Override + public List getRole(String positionId) { + return tsPositionDao.getRole(positionId); + } + + /** + * 添加岗位 + * @param tsPosition：岗位信息 + * @return ResponseMessage + */ + @Override + public ResponseMessage addPosition(TsPosition tsPosition) { + QueryWrapper positionQueryWrapper=new QueryWrapper<>(); + positionQueryWrapper.eq("name",tsPosition.getName()); + List tsPositions=tsPositionDao.selectList(positionQueryWrapper); + if(tsPositions!=null&&tsPositions.size()>0){ + return Result.error("该岗位已存在"); + } + //设置操作时间为当前系统时间 + tsPosition.setOperateTime(new Timestamp(System.currentTimeMillis())); + tsPosition.setType("2"); + tsPositionDao.insert(tsPosition); + return Result.success(); + } + + /** + * 修改岗位 + * @param tsPosition：岗位信息 + * @return ResponseMessage + */ + @Override + public ResponseMessage updatePosition(TsPosition tsPosition) { + TsPosition oldPosition=tsPositionDao.selectById(tsPosition.getId()); + if(oldPosition==null){ + return Result.error("该岗位不存在"); + } + if(!oldPosition.getType().equals("2")){ + return Result.error("该岗位不可修改"); + } + tsPosition.setOperateTime(new Timestamp(System.currentTimeMillis())); + tsPositionDao.updateById(tsPosition); + return Result.success(); + } + + /** + * 删除岗位 + * @param positionId：岗位ID + * @return ResponseMessage + */ + @Override + public ResponseMessage deletePosition(String positionId) { + TsPosition oldPosition=tsPositionDao.selectById(positionId); + if(oldPosition==null){ + return Result.error("该岗位不存在"); + } + if(!oldPosition.getType().equals("2")){ + return Result.error("该岗位不可删除"); + } + List roleIds=tsPositionDao.getRoleId(positionId); + if(roleIds!=null&&roleIds.size()>0){ + return Result.error("该岗位已绑定角色，无法删除"); + } + tsPositionDao.deleteById(positionId); + return Result.success(); + } + + /** + * 通过岗位列表查询绑定的角色列表 + * @param positionIds：岗位列表 + * @return List + */ + @Override + public List getRoleIdsByPositionIds(List positionIds) { + if(positionIds!=null&&positionIds.size()>0){ + return tsPositionDao.getRoleIdsByPositionIds(positionIds); + } + return null; + } + + /** + * 通过roleId查询岗位ID列表 + * @param roleId：角色ID + * @return List + */ + @Override + public List getPositionIdsByRoleId(String roleId) { + return tsPositionDao.getPositionIdsByRoleId(roleId); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java index 0111de68..aaf0202c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java @@ -3,12 +3,16 @@ package com.adc.da.slrs.sarStandIdea.controller; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll; import com.adc.da.slrs.sarStandIdea.entity.SeByoDto; +import com.adc.da.slrs.sarStandIdea.service.ISarPublicIdeaAllService; import com.adc.da.slrs.sarStandIdea.service.ISarPublicIdeaService; import com.adc.da.slrs.sarStandIdea.service.Impl.SarPublicIdeaServiceImpl; import com.adc.da.sys.util.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdea; @@ -36,6 +40,9 @@ public class SarPublicIdeaController extends BaseController { @Autowired private ISarPublicIdeaService sarPublicIdeaService; + @Autowired + private ISarPublicIdeaAllService sarPublicIdeaAllService; + @ApiOperation(value = "分页查询") @GetMapping("/SelectAllPage") public ResponseMessage selectAllPage(@RequestParam(defaultValue="1")Integer page,@RequestParam(defaultValue="10")Integer size,String categorg, String cname, @@ -87,4 +94,18 @@ public class SarPublicIdeaController extends BaseController { } + @ApiOperation(value = "动态查询") + @GetMapping("/deletePublicIdea") + public ResponseMessage delete(@RequestParam("id") String id){ + QueryWrapper wrapper=new QueryWrapper<>(); + wrapper.eq("uniques",id); + SarPublicIdea sarPublicIdea=sarPublicIdeaService.getOne(wrapper); + sarPublicIdeaService.remove(wrapper); + QueryWrapper wrapper1=new QueryWrapper<>(); + wrapper1.eq("idea_id",sarPublicIdea.getId()); + sarPublicIdeaAllService.remove(wrapper1); + return Result.success(); + } + + } 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 5a4693fe..b6b8aa56 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 @@ -280,6 +280,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl sarStandItems = dao.querySarItemAndInterpretation(page); + sarStandItems.forEach(sarStandItems1 -> sarStandItems1.setTermsConditions(StringUtils.replace(sarStandItems1.getTermsConditions(),"''","'"))); return sarStandItems; } 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 7816f1f8..74fd0673 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 @@ -69,6 +69,12 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl strings=new ArrayList<>(); + strings.add("G4"); + strings.add("G9"); + strings.add("G8"); + strings.add("G7"); + //LIST是数组，所以强转成JSONArray JsonArray LIST = (JsonArray) jsonObject.get("LIST"); @@ -105,13 +111,15 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl updateCondition = new QueryWrapper(); updateCondition.eq("project_number",projectInfo.getProjectNumber()); + SarStandProjectLibrary res=this.getOne(updateCondition); + if (strings.contains(projectInfo.getCurrentNode().trim()) && !res.getCurrentNode().trim().equals(projectInfo.getCurrentNode())){ + projectInfo.setFlag("0"); + } + // .eq("project_start_date",targetBeginOn); - - this.saveOrUpdate(projectInfo,updateCondition); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 46c4b998..9378a404 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -55,8 +55,8 @@ public class SarStandardComplianceAssessResultController { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); queryWrapper.select(" STAND_ID,ANY_VALUE(STAND_NUMBER) as STAND_NUMBER, STAND_NAME, STAND_TYPE"); - if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { - queryWrapper.like("STAND_NAME", eo.getStandName().trim()); + if (eo.getStandName() != null ) { + queryWrapper.like("STAND_NAME", eo.getStandName().replace(" ","")); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim()); @@ -219,8 +219,7 @@ public class SarStandardComplianceAssessResultController { for (SarStandardComplianceProductAssess s:sarStandardCompliance) { if (null!=s.getStandardItem()) { - String gos= StringUtils.replace(s.getStandardItem(),".",","); - String[] as=(gos+",").split(","); + String[] as=(s.getStandardItem()+",").split(","); if (orderKey.contains(Integer.valueOf(as[0].trim().toString()))) { stringMap.get(Integer.valueOf(as[0].trim().toString())).add(s); } else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 1e6dc360..4282d025 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -233,7 +233,7 @@ public class SarStandardsInfoController extends BaseController // sarAdvanceSearchVO.setField("STAND_SYSTEM"); // } // }); - String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_standards_info"); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_stand_attr_info"); if (StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java index 1049e123..e3c5eaeb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java @@ -239,7 +239,7 @@ public class SarUpdLogServiceImpl extends ServiceImpl i // case "country": return "适用区域"; // case "isRelateAccess": return "重要度"; case "issueTime": return "发布日期"; - case "putTime": return "标准实施日期"; + case "putTime": return "企标实施日期"; // case "standYear": return "标准年份"; // case "standNature": return "标准性质"; case "standEnName": return "英文名称"; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/dao/WgCommitteeDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/dao/WgCommitteeDao.java index 2d78894a..3777ca7e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/dao/WgCommitteeDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/dao/WgCommitteeDao.java @@ -1,26 +1,29 @@ -package com.adc.da.slrs.wgCommittee.dao; - - -import com.adc.da.slrs.wgCommittee.entity.WgCommittee; -import com.adc.da.slrs.wgCommittee.entity.WgCommitteeDTO; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -import java.util.List; - -/** - *

- * 标准委员会 Mapper 接口 - *

- * - * @author yzh - * @since 2022-03-10 - */ -public interface WgCommitteeDao extends BaseMapper { - - List getData(WgCommittee wgCommittee); - Integer getDataCount(WgCommittee wgCommittee); - - List getDataWk(WgCommittee wgCommittee); - Integer getDataCountWk(WgCommittee wgCommittee); - -} +package com.adc.da.slrs.wgCommittee.dao; + + +import com.adc.da.slrs.wgCommittee.entity.WgCommittee; +import com.adc.da.slrs.wgCommittee.entity.WgCommitteeDTO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 标准委员会 Mapper 接口 + *

+ * + * @author yzh + * @since 2022-03-10 + */ +public interface WgCommitteeDao extends BaseMapper { + + List getData(WgCommittee wgCommittee); + Integer getDataCount(WgCommittee wgCommittee); + + List getDataWk(WgCommittee wgCommittee); + Integer getDataCountWk(WgCommittee wgCommittee); + + String selectCommittor(@Param("str") List str); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/service/impl/WgCommitteeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/service/impl/WgCommitteeServiceImpl.java index b3499f77..9a829cc1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/service/impl/WgCommitteeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/service/impl/WgCommitteeServiceImpl.java @@ -1,93 +1,97 @@ -package com.adc.da.slrs.wgCommittee.service.impl; - -import com.adc.da.slrs.wgCommittee.entity.WgCommittee; -import com.adc.da.slrs.wgCommittee.dao.WgCommitteeDao; -import com.adc.da.slrs.wgCommittee.entity.WgCommitteeDTO; -import com.adc.da.slrs.wgCommittee.service.IWgCommitteeService; -import com.adc.da.slrs.wgCommitteeUser.entity.WgCommitteeUser; -import com.adc.da.slrs.wgCommitteeUser.service.IWgCommitteeUserService; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.UUID; - -/** - *

- * 标准委员会 服务实现类 - *

- * - * @author yzh - * @since 2022-03-10 - */ -@Service -public class WgCommitteeServiceImpl extends ServiceImpl implements IWgCommitteeService { - - @Autowired - IWgCommitteeUserService iWgCommitteeUserService; - @Autowired - IWgCommitteeService iWgCommitteeService; - @Autowired - WgCommitteeDao wgCommitteeDao; - - @Transactional - @Override - public boolean add(WgCommittee wgCommittee) { - wgCommittee.setId(String.valueOf(UUID.randomUUID())); - String id=String.valueOf(UUID.randomUUID()); - wgCommittee.setCommitteer(id); - List list=new ArrayList<>(); - if (null!=wgCommittee.getCommitteeIds() && !wgCommittee.getCommitteeIds().isEmpty()) { - List res=new ArrayList<>(Arrays.asList(wgCommittee.getCommitteeIds().split(","))); - res.stream().forEach(s -> list.add(new WgCommitteeUser().setCommitterId(s).setId(wgCommittee.getCommitteer()))); - iWgCommitteeUserService.saveOrUpdateBatch(list); - } - if (iWgCommitteeService.saveOrUpdate(wgCommittee)) { - return true; - }else { - return false; - } - } - - @Transactional - @Override - public boolean update(WgCommittee wgCommittee) { - iWgCommitteeService.updateById(wgCommittee); - List save=new ArrayList<>(); - if (null!=wgCommittee.getCommitteeIds() && !wgCommittee.getCommitteeIds().isEmpty()){ - List res=new ArrayList<>(Arrays.asList(wgCommittee.getCommitteeIds().split(","))); - res.forEach(s -> save.add(new WgCommitteeUser().setId(wgCommittee.getCommitteer()).setCommitterId(s))); - } - if (iWgCommitteeUserService.updateBatchById(save)) { - return true; - }else { - return false; - } - } - - @Override - public IPage getWgCommittee(WgCommittee wgCommittee) { - Page page=new Page(); - page.setRecords(wgCommitteeDao.getData(wgCommittee)); - page.setCurrent(wgCommittee.getPage()); - page.setSize(wgCommittee.getPageSize()); - page.setTotal(wgCommitteeDao.getDataCount(wgCommittee)); - return page; - } - - @Override - public IPage getWgCommitteeWk(WgCommittee wgCommittee) { - Page page=new Page(); - page.setRecords(wgCommitteeDao.getDataWk(wgCommittee)); - page.setCurrent(wgCommittee.getPage()); - page.setSize(wgCommittee.getPageSize()); - page.setTotal(wgCommitteeDao.getDataCountWk(wgCommittee)); - return page; - } -} +package com.adc.da.slrs.wgCommittee.service.impl; + +import com.adc.da.slrs.wgCommittee.entity.WgCommittee; +import com.adc.da.slrs.wgCommittee.dao.WgCommitteeDao; +import com.adc.da.slrs.wgCommittee.entity.WgCommitteeDTO; +import com.adc.da.slrs.wgCommittee.service.IWgCommitteeService; +import com.adc.da.slrs.wgCommitteeUser.entity.WgCommitteeUser; +import com.adc.da.slrs.wgCommitteeUser.service.IWgCommitteeUserService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; + +/** + *

+ * 标准委员会 服务实现类 + *

+ * + * @author yzh + * @since 2022-03-10 + */ +@Service +public class WgCommitteeServiceImpl extends ServiceImpl implements IWgCommitteeService { + + @Autowired + IWgCommitteeUserService iWgCommitteeUserService; + @Autowired + IWgCommitteeService iWgCommitteeService; + @Autowired + WgCommitteeDao wgCommitteeDao; + + @Transactional + @Override + public boolean add(WgCommittee wgCommittee) { + wgCommittee.setId(String.valueOf(UUID.randomUUID())); + String id=String.valueOf(UUID.randomUUID()); + wgCommittee.setCommitteer(id); + List list=new ArrayList<>(); + if (null!=wgCommittee.getCommitteeIds() && !wgCommittee.getCommitteeIds().isEmpty()) { + List res=new ArrayList<>(Collections.singletonList(wgCommittee.getCommitteeIds())); + res.stream().forEach(s -> list.add(new WgCommitteeUser().setCommitterId(s).setId(wgCommittee.getCommitteer()))); + iWgCommitteeUserService.saveOrUpdateBatch(list); + } + if (iWgCommitteeService.saveOrUpdate(wgCommittee)) { + return true; + }else { + return false; + } + } + + @Transactional + @Override + public boolean update(WgCommittee wgCommittee) { + iWgCommitteeService.updateById(wgCommittee); + List save=new ArrayList<>(); + if (null!=wgCommittee.getCommitteeIds() && !wgCommittee.getCommitteeIds().isEmpty()){ + List res=new ArrayList<>(Collections.singletonList(wgCommittee.getCommitteeIds())); + res.forEach(s -> + save.add(new WgCommitteeUser().setId(wgCommittee.getCommitteer()).setCommitterId(s)) + ); + } + if (iWgCommitteeUserService.updateBatchById(save)) { + return true; + }else { + return false; + } + } + + @Override + public IPage getWgCommittee(WgCommittee wgCommittee) { + Page page=new Page(); + List list = wgCommitteeDao.getData(wgCommittee); + for (WgCommitteeDTO wgCommitteeDTO : list){ + List str = Arrays.asList(wgCommitteeDTO.getCommittorId().split(",")); + wgCommitteeDTO.setCommittor(wgCommitteeDao.selectCommittor(str)); + } + page.setRecords(list); + page.setCurrent(wgCommittee.getPage()); + page.setSize(wgCommittee.getPageSize()); + page.setTotal(wgCommitteeDao.getDataCount(wgCommittee)); + return page; + } + + @Override + public IPage getWgCommitteeWk(WgCommittee wgCommittee) { + Page page=new Page(); + page.setRecords(wgCommitteeDao.getDataWk(wgCommittee)); + page.setCurrent(wgCommittee.getPage()); + page.setSize(wgCommittee.getPageSize()); + page.setTotal(wgCommitteeDao.getDataCountWk(wgCommittee)); + return page; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java index b35dd3f9..fcfd9c1f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java @@ -121,9 +121,9 @@ public class SarAdvanceSearchUtil { case "BETWEEN": String[] boundaryArray = searchVO.getValue().split(","); if (i == 0) { - sql += "DATE_FORMAT(" + tableName + searchVO.getField() + ",'%Y-%m-%d')" + " " + "BETWEEN" + " " + "DATE_FORMAT(" + "\'" + boundaryArray[0].replaceAll("\\s*", "") + "\'" + ",'%Y-%m-%d')" + " AND " + "DATE_FORMAT(" + "\'" + boundaryArray[1].replaceAll("\\s*", "") + "\'" + ",'%Y-%m-%d')"; + sql += "DATE_FORMAT(left(" + tableName + searchVO.getField() + ",10),'%Y-%m-%d')" + " " + "BETWEEN" + " " + "DATE_FORMAT(" + "\'" + boundaryArray[0].replaceAll("\\s*", "") + "\'" + ",'%Y-%m-%d')" + " AND " + "DATE_FORMAT(" + "\'" + boundaryArray[1].replaceAll("\\s*", "") + "\'" + ",'%Y-%m-%d')"; } else { - sql += " AND " + " " + "DATE_FORMAT(" + tableName + searchVO.getField() + ",'%Y-%m-%d')" + " " + "BETWEEN" + " " + "DATE_FORMAT(" + "\'" + boundaryArray[0].replaceAll("\\s*", "") + "\'" + ",'%Y-%m-%d')" + " AND " + "DATE_FORMAT(" + "\'" + boundaryArray[1].replaceAll("\\s*", "") + "\'" + ",'%Y-%m-%d')"; + sql += " AND " + " " + "DATE_FORMAT(left(" + tableName + searchVO.getField() + ",10),'%Y-%m-%d')" + " " + "BETWEEN" + " " + "DATE_FORMAT(" + "\'" + boundaryArray[0].replaceAll("\\s*", "") + "\'" + ",'%Y-%m-%d')" + " AND " + "DATE_FORMAT(" + "\'" + boundaryArray[1].replaceAll("\\s*", "") + "\'" + ",'%Y-%m-%d')"; } break; case "equals": diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgCommittee/WgCommitteeMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgCommittee/WgCommitteeMapper.xml index 8a55b8e4..3be2666f 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgCommittee/WgCommitteeMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgCommittee/WgCommitteeMapper.xml @@ -1,69 +1,73 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + +