From e7ccb5c4d7caf995e001ff1bbee127b845e5bcf1 Mon Sep 17 00:00:00 2001 From: 11528 <1152856986@qq.com> Date: Fri, 18 Mar 2022 16:39:37 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=B2=97=E4=BD=8D=EF=BC=9A=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=97=B6=E9=97=B4=EF=BC=8C=E6=9C=BA=E6=9E=84=EF=BC=9A?= =?UTF-8?q?=E5=A7=94=E5=91=98=E4=BC=9A=E7=BC=96=E8=BE=91=EF=BC=8C=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=88=E8=A7=84=EF=BC=9A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TsPositionController.java | 154 ++-- .../slrs/sarPosition/entity/TsPosition.java | 192 ++--- .../service/ITsPositionService.java | 154 ++-- .../service/impl/TsPositionServiceImpl.java | 374 +++++----- ...ndardComplianceAssessResultController.java | 682 +++++++++--------- .../slrs/wgCommittee/dao/WgCommitteeDao.java | 55 +- .../service/impl/WgCommitteeServiceImpl.java | 193 ++--- .../mapper/wgCommittee/WgCommitteeMapper.xml | 142 ++-- 8 files changed, 986 insertions(+), 960 deletions(-) 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/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..9d289a10 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,192 @@ -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())); + baseMapper.update(tsPosition,updateWrapper); + } + for(String id:deleteIds){ + tsPositionDao.deleteRole(tsPositionRoleVO.getPositionId(),id); + updateWrapper.eq("id", tsPositionRoleVO.getPositionId()); + tsPosition.setOperateTime(new Timestamp(System.currentTimeMillis())); + 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/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 464d811c..b97b342e 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 @@ -1,341 +1,341 @@ -package com.adc.da.slrs.sarStandardComplianceAssessResult.controller; - - -import com.adc.da.http.ResponseMessage; -import com.adc.da.http.Result; -import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.*; -import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarInterpretationForeignStandardService; -import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarInterpretationNationalStandardService; -import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarStandardComplianceProductAssessService; -import com.adc.da.util.UUIDUtils; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.apache.commons.beanutils.BeanUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.lang.reflect.InvocationTargetException; -import java.util.*; - -/** - *

- * 标准法规准入清单详情表 前端控制器 - *

- * - * @author super_liu - * @since 2021-06-02 - */ -@RestController -@Api(tags = "福田标准法规--标准法规库--标准合规评估结果") -@RequestMapping("/${restPath}/sarStandardComplianceAssessResult") -public class SarStandardComplianceAssessResultController { - - private static final Logger logger = LoggerFactory.getLogger(SarStandardComplianceAssessResultController.class); - - - @Autowired - private ISarStandardComplianceProductAssessService iSarStandardComplianceProductAssessService; - - @Autowired - private ISarInterpretationForeignStandardService iSarInterpretationForeignStandardService; - @Autowired - private ISarInterpretationNationalStandardService iSarInterpretationNationalStandardService; - - @ApiOperation(value = "条件查询标准清单") - @GetMapping("/standard") - public ResponseMessage selectStandard(SarStandardsInfoEO eo) throws Exception { - - if (eo.getStandApplicationType() == 1) { - 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.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { - queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim()); - } - if (eo.getType() != null && !eo.getType().trim().equals("")) { - queryWrapper.like("type", eo.getType().trim()); - } - queryWrapper.groupBy("STAND_ID,STAND_NAME,STAND_TYPE"); - IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); - - while (page.getRecords().remove(null)) ; - - return Result.success(page); - } else { - if (eo.getPosition() == 1) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,risk_degree"); - if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { - queryWrapper.like("STAND_NAME", eo.getStandName().trim()); - } - if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { - queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim()); - } - - IPage page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper); - - while (page.getRecords().remove(null)) ; - - return Result.success(page); - } else { - QueryWrapper queryWrapper = new QueryWrapper<>(); - IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME"); - if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { - queryWrapper.like("STAND_NAME", eo.getStandName().trim()); - } - if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { - queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim()); - } - - IPage page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper); - while(page.getRecords().remove(null)); - return Result.success(page); - } - } - } - - private static class InsertEntity{ - List entityList; - T eo; - } - - @ApiOperation(value = "（插入/更新）标准清单") - @PostMapping("/standard") - public ResponseMessage insertStandard(@RequestBody InsertEntity insertEntity) throws InvocationTargetException, IllegalAccessException { - - SarStandardsInfoEO eo = insertEntity.eo; - - if (eo.getStandApplicationType() == 1) { - - List entityList = new ArrayList<>(); - for (int i = 0; i < insertEntity.entityList.size(); i++) { - SarStandardComplianceProductAssess obj = new SarStandardComplianceProductAssess(); - BeanUtils.populate(obj, insertEntity.entityList.get(i)); - entityList.add(obj); - } - - iSarStandardComplianceProductAssessService.saveOrUpdateBatch(entityList); - - } else { - if (eo.getPosition() == 1) { - List entityList = new ArrayList<>(); - for (int i = 0; i < insertEntity.entityList.size(); i++) { - SarInterpretationNationalStandard obj = new SarInterpretationNationalStandard(); - BeanUtils.populate(obj, insertEntity.entityList.get(i)); - entityList.add(obj); - } - iSarInterpretationNationalStandardService.saveOrUpdateBatch(entityList); - - }else{ - List entityList = new ArrayList<>(); - for (int i = 0; i < insertEntity.entityList.size(); i++) { - SarInterpretationForeignStandard obj = new SarInterpretationForeignStandard(); - BeanUtils.populate(obj, insertEntity.entityList.get(i)); - entityList.add(obj); - } - iSarInterpretationForeignStandardService.saveOrUpdateBatch(entityList); - - } - } - - - return Result.success(); - } - - @ApiOperation(value = "条件查询标准涉及项目符合性清单") - @GetMapping("/product") - public ResponseMessage> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception { - IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - QueryWrapper queryWrapper = new QueryWrapper<>(); - if (eo.getType() != null) queryWrapper.eq("type", eo.getType()); - if (eo.getProductName() != null) queryWrapper.like("product_name", eo.getProductName()); - if (eo.getProductId() != null) queryWrapper.like("product_id", eo.getProductId()); - queryWrapper.orderByAsc("product_name"); - queryWrapper.orderByAsc("standard_item"); - -// if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); - - IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); - return Result.success(page); - } - - - @ApiOperation(value = "标准涉及项目复合性详情") - @GetMapping("/productNewDetail") - public ResponseMessage>> selectProductDetail(SarStandardComplianceProductAssessEO eo) throws Exception { - IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - Map> map=new HashMap<>(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("STAND_ID", eo.getStandId()); - queryWrapper.eq("product_id", eo.getProductId()); - queryWrapper.and(sarStandardComplianceProductAssessQueryWrapper -> sarStandardComplianceProductAssessQueryWrapper.eq("no_involve","").or().isNull("no_involve")); - queryWrapper.isNotNull("research_completion_time"); - queryWrapper.orderByAsc("product_name"); - queryWrapper.orderByAsc("standard_item"); - Page p1=new Page(); - IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); - BeanUtils.copyProperties(page,p1); - p1.setRecords(orderUtils(page.getRecords())); - p1.setTotal(page.getTotal()); - map.put("unfit",p1); - QueryWrapper queryWrapper1 = new QueryWrapper<>(); - queryWrapper1.eq("STAND_ID", eo.getStandId()); - queryWrapper1.eq("product_id", eo.getProductId()); - queryWrapper1.and(sarStandardComplianceProductAssessQueryWrapper -> sarStandardComplianceProductAssessQueryWrapper.ne("research_compliance","").or().isNotNull("research_compliance")); - queryWrapper1.orderByAsc("product_name"); - queryWrapper1.orderByAsc("standard_item"); - IPage page1 = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper1); - Page p2=new Page(); - BeanUtils.copyProperties(page1,p2); - p2.setRecords(orderUtils(page1.getRecords())); - p2.setTotal(page1.getTotal()); - map.put("fit",p2); - QueryWrapper queryWrapper2 = new QueryWrapper<>(); - queryWrapper2.eq("STAND_ID", eo.getStandId()); - queryWrapper2.eq("product_id", eo.getProductId()); - queryWrapper2.and(sarStandardComplianceProductAssessQueryWrapper -> sarStandardComplianceProductAssessQueryWrapper.ne("no_involve","").and(sarStandardComplianceProductAssessQueryWrapper1 -> sarStandardComplianceProductAssessQueryWrapper1.isNotNull("no_involve"))); - queryWrapper2.orderByAsc("product_name"); - queryWrapper2.orderByAsc("standard_item"); - IPage page2 = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper2); - page2.setRecords(orderUtils(page2.getRecords())); - map.put("noFit",page2); - return Result.success(map); - } - - private List orderUtils(List sarStandardCompliance){ - Map> stringMap=new HashMap<>(); - List orderKey=new ArrayList<>(); - - for (SarStandardComplianceProductAssess s:sarStandardCompliance) { - if (null!=s.getStandardItem()) { - 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 { - orderKey.add(Integer.valueOf(as[0].trim().toString())); - List assesses2 = new ArrayList<>(); - assesses2.add(s); - stringMap.put(Integer.valueOf(as[0].trim().toString()), assesses2); - } - }else { - if (null!=stringMap.get(0)) { - stringMap.get(0).add(s); - }else { - List assesses = new ArrayList<>(); - assesses.add(s); - stringMap.put(0,assesses); - orderKey.add(0); - } - } - - - - } - Collections.sort(orderKey,(o1, o2) -> { - return (o1 -o2); - }); - List res=new ArrayList<>(); - orderKey.forEach(integer -> { - res.addAll(stringMap.get(integer)); - }); - return res; - } - - @ApiOperation(value = "标准涉及项目复合性") - @GetMapping("/productNew") - public ResponseMessage> selectProduct(unCountDTO eo) throws Exception { - Page iPage = new Page<>(); - iPage.setCurrent(eo.getCurrent()); - iPage.setSize(eo.getSize()); - - IPage page = iSarStandardComplianceProductAssessService.selectPages(iPage, eo); - return Result.success(page); - } - - @ApiOperation(value = "插入标准涉及项目符合性清单") - @PostMapping("/add") - public ResponseMessage insertProduct(@RequestBody List eo) throws Exception { - - eo.forEach(sarStandardComplianceProductAssess -> { - sarStandardComplianceProductAssess.setId(UUIDUtils.randomUUID(32)); - sarStandardComplianceProductAssess.setInterpretationTime(new Date()); - }); - iSarStandardComplianceProductAssessService.saveBatch(eo); - - - return Result.success(); - } - - - @ApiOperation(value = "条件查询技术审核符合性清单") - @GetMapping("/interpretation") - public ResponseMessage selectNationalStandard(InterpretationEO eo) throws Exception { - if (eo.getPosition() == 1) { - IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - List standards=iSarInterpretationNationalStandardService.getAllDatas(eo); - Integer datasCount=iSarInterpretationNationalStandardService.getAllDatasCount(eo); - iPage.setTotal(datasCount); - iPage.setRecords(standards); - while (iPage.getRecords().remove(null)) ; - return Result.success(iPage); - } else { - IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - QueryWrapper queryWrapper = new QueryWrapper<>(); - //如果查询条件里标准编号不为空，查询 - if (eo.getStandNumber() != null) queryWrapper.like("STAND_NUMBER",eo.getStandNumber()); - //如果查询条件里标准名称不为空，查询 - if (eo.getStandName() != null) queryWrapper.like("STAND_NAME",eo.getStandName()); - //如果查询条件里具体章条不为空，查询 - if (eo.getSpecificItem() != null) queryWrapper.like("specific_item",eo.getSpecificItem()); - - if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); - if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId()); - IPage page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper); - while (page.getRecords().remove(null)) ; - - return Result.success(page); - } - } - - - @ApiOperation(value = "插入技术审核符合性清单") - @PostMapping("/interpretation") - public ResponseMessage insertInterpretation(InsertEntity insertEntity) throws Exception { - - InterpretationEO eo = insertEntity.eo; - - if (eo.getPosition() == 1) { - - List entityList = new ArrayList<>(); - for (int i = 0; i < insertEntity.entityList.size(); i++) { - SarInterpretationNationalStandard obj = new SarInterpretationNationalStandard(); - BeanUtils.populate(obj, insertEntity.entityList.get(i)); - entityList.add(obj); - } - iSarInterpretationNationalStandardService.saveOrUpdateBatch(entityList); - } else { - - - List entityList = new ArrayList<>(); - for (int i = 0; i < insertEntity.entityList.size(); i++) { - SarInterpretationForeignStandard obj = new SarInterpretationForeignStandard(); - BeanUtils.populate(obj, insertEntity.entityList.get(i)); - entityList.add(obj); - } - iSarInterpretationForeignStandardService.saveOrUpdateBatch(entityList); - - } - - return Result.success(); - } -} +package com.adc.da.slrs.sarStandardComplianceAssessResult.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.*; +import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarInterpretationForeignStandardService; +import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarInterpretationNationalStandardService; +import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarStandardComplianceProductAssessService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.beanutils.BeanUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.lang.reflect.InvocationTargetException; +import java.util.*; + +/** + *

+ * 标准法规准入清单详情表 前端控制器 + *

+ * + * @author super_liu + * @since 2021-06-02 + */ +@RestController +@Api(tags = "福田标准法规--标准法规库--标准合规评估结果") +@RequestMapping("/${restPath}/sarStandardComplianceAssessResult") +public class SarStandardComplianceAssessResultController { + + private static final Logger logger = LoggerFactory.getLogger(SarStandardComplianceAssessResultController.class); + + + @Autowired + private ISarStandardComplianceProductAssessService iSarStandardComplianceProductAssessService; + + @Autowired + private ISarInterpretationForeignStandardService iSarInterpretationForeignStandardService; + @Autowired + private ISarInterpretationNationalStandardService iSarInterpretationNationalStandardService; + + @ApiOperation(value = "条件查询标准清单") + @GetMapping("/standard") + public ResponseMessage selectStandard(SarStandardsInfoEO eo) throws Exception { + + if (eo.getStandApplicationType() == 1) { + 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 ) { + queryWrapper.like("STAND_NAME", eo.getStandName().replace(" ","")); + } + if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { + queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim()); + } + if (eo.getType() != null && !eo.getType().trim().equals("")) { + queryWrapper.like("type", eo.getType().trim()); + } + queryWrapper.groupBy("STAND_ID,STAND_NAME,STAND_TYPE"); + IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); + + while (page.getRecords().remove(null)) ; + + return Result.success(page); + } else { + if (eo.getPosition() == 1) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); + queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,risk_degree"); + if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { + queryWrapper.like("STAND_NAME", eo.getStandName().trim()); + } + if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { + queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim()); + } + + IPage page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper); + + while (page.getRecords().remove(null)) ; + + return Result.success(page); + } else { + QueryWrapper queryWrapper = new QueryWrapper<>(); + IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); + queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME"); + if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { + queryWrapper.like("STAND_NAME", eo.getStandName().trim()); + } + if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { + queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim()); + } + + IPage page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper); + while(page.getRecords().remove(null)); + return Result.success(page); + } + } + } + + private static class InsertEntity{ + List entityList; + T eo; + } + + @ApiOperation(value = "（插入/更新）标准清单") + @PostMapping("/standard") + public ResponseMessage insertStandard(@RequestBody InsertEntity insertEntity) throws InvocationTargetException, IllegalAccessException { + + SarStandardsInfoEO eo = insertEntity.eo; + + if (eo.getStandApplicationType() == 1) { + + List entityList = new ArrayList<>(); + for (int i = 0; i < insertEntity.entityList.size(); i++) { + SarStandardComplianceProductAssess obj = new SarStandardComplianceProductAssess(); + BeanUtils.populate(obj, insertEntity.entityList.get(i)); + entityList.add(obj); + } + + iSarStandardComplianceProductAssessService.saveOrUpdateBatch(entityList); + + } else { + if (eo.getPosition() == 1) { + List entityList = new ArrayList<>(); + for (int i = 0; i < insertEntity.entityList.size(); i++) { + SarInterpretationNationalStandard obj = new SarInterpretationNationalStandard(); + BeanUtils.populate(obj, insertEntity.entityList.get(i)); + entityList.add(obj); + } + iSarInterpretationNationalStandardService.saveOrUpdateBatch(entityList); + + }else{ + List entityList = new ArrayList<>(); + for (int i = 0; i < insertEntity.entityList.size(); i++) { + SarInterpretationForeignStandard obj = new SarInterpretationForeignStandard(); + BeanUtils.populate(obj, insertEntity.entityList.get(i)); + entityList.add(obj); + } + iSarInterpretationForeignStandardService.saveOrUpdateBatch(entityList); + + } + } + + + return Result.success(); + } + + @ApiOperation(value = "条件查询标准涉及项目符合性清单") + @GetMapping("/product") + public ResponseMessage> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception { + IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); + QueryWrapper queryWrapper = new QueryWrapper<>(); + if (eo.getType() != null) queryWrapper.eq("type", eo.getType()); + if (eo.getProductName() != null) queryWrapper.like("product_name", eo.getProductName()); + if (eo.getProductId() != null) queryWrapper.like("product_id", eo.getProductId()); + queryWrapper.orderByAsc("product_name"); + queryWrapper.orderByAsc("standard_item"); + +// if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); + + IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); + return Result.success(page); + } + + + @ApiOperation(value = "标准涉及项目复合性详情") + @GetMapping("/productNewDetail") + public ResponseMessage>> selectProductDetail(SarStandardComplianceProductAssessEO eo) throws Exception { + IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); + Map> map=new HashMap<>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("STAND_ID", eo.getStandId()); + queryWrapper.eq("product_id", eo.getProductId()); + queryWrapper.and(sarStandardComplianceProductAssessQueryWrapper -> sarStandardComplianceProductAssessQueryWrapper.eq("no_involve","").or().isNull("no_involve")); + queryWrapper.isNotNull("research_completion_time"); + queryWrapper.orderByAsc("product_name"); + queryWrapper.orderByAsc("standard_item"); + Page p1=new Page(); + IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); + BeanUtils.copyProperties(page,p1); + p1.setRecords(orderUtils(page.getRecords())); + p1.setTotal(page.getTotal()); + map.put("unfit",p1); + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.eq("STAND_ID", eo.getStandId()); + queryWrapper1.eq("product_id", eo.getProductId()); + queryWrapper1.and(sarStandardComplianceProductAssessQueryWrapper -> sarStandardComplianceProductAssessQueryWrapper.ne("research_compliance","").or().isNotNull("research_compliance")); + queryWrapper1.orderByAsc("product_name"); + queryWrapper1.orderByAsc("standard_item"); + IPage page1 = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper1); + Page p2=new Page(); + BeanUtils.copyProperties(page1,p2); + p2.setRecords(orderUtils(page1.getRecords())); + p2.setTotal(page1.getTotal()); + map.put("fit",p2); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); + queryWrapper2.eq("STAND_ID", eo.getStandId()); + queryWrapper2.eq("product_id", eo.getProductId()); + queryWrapper2.and(sarStandardComplianceProductAssessQueryWrapper -> sarStandardComplianceProductAssessQueryWrapper.ne("no_involve","").and(sarStandardComplianceProductAssessQueryWrapper1 -> sarStandardComplianceProductAssessQueryWrapper1.isNotNull("no_involve"))); + queryWrapper2.orderByAsc("product_name"); + queryWrapper2.orderByAsc("standard_item"); + IPage page2 = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper2); + page2.setRecords(orderUtils(page2.getRecords())); + map.put("noFit",page2); + return Result.success(map); + } + + private List orderUtils(List sarStandardCompliance){ + Map> stringMap=new HashMap<>(); + List orderKey=new ArrayList<>(); + + for (SarStandardComplianceProductAssess s:sarStandardCompliance) { + if (null!=s.getStandardItem()) { + 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 { + orderKey.add(Integer.valueOf(as[0].trim().toString())); + List assesses2 = new ArrayList<>(); + assesses2.add(s); + stringMap.put(Integer.valueOf(as[0].trim().toString()), assesses2); + } + }else { + if (null!=stringMap.get(0)) { + stringMap.get(0).add(s); + }else { + List assesses = new ArrayList<>(); + assesses.add(s); + stringMap.put(0,assesses); + orderKey.add(0); + } + } + + + + } + Collections.sort(orderKey,(o1, o2) -> { + return (o1 -o2); + }); + List res=new ArrayList<>(); + orderKey.forEach(integer -> { + res.addAll(stringMap.get(integer)); + }); + return res; + } + + @ApiOperation(value = "标准涉及项目复合性") + @GetMapping("/productNew") + public ResponseMessage> selectProduct(unCountDTO eo) throws Exception { + Page iPage = new Page<>(); + iPage.setCurrent(eo.getCurrent()); + iPage.setSize(eo.getSize()); + + IPage page = iSarStandardComplianceProductAssessService.selectPages(iPage, eo); + return Result.success(page); + } + + @ApiOperation(value = "插入标准涉及项目符合性清单") + @PostMapping("/add") + public ResponseMessage insertProduct(@RequestBody List eo) throws Exception { + + eo.forEach(sarStandardComplianceProductAssess -> { + sarStandardComplianceProductAssess.setId(UUIDUtils.randomUUID(32)); + sarStandardComplianceProductAssess.setInterpretationTime(new Date()); + }); + iSarStandardComplianceProductAssessService.saveBatch(eo); + + + return Result.success(); + } + + + @ApiOperation(value = "条件查询技术审核符合性清单") + @GetMapping("/interpretation") + public ResponseMessage selectNationalStandard(InterpretationEO eo) throws Exception { + if (eo.getPosition() == 1) { + IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); + List standards=iSarInterpretationNationalStandardService.getAllDatas(eo); + Integer datasCount=iSarInterpretationNationalStandardService.getAllDatasCount(eo); + iPage.setTotal(datasCount); + iPage.setRecords(standards); + while (iPage.getRecords().remove(null)) ; + return Result.success(iPage); + } else { + IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); + QueryWrapper queryWrapper = new QueryWrapper<>(); + //如果查询条件里标准编号不为空，查询 + if (eo.getStandNumber() != null) queryWrapper.like("STAND_NUMBER",eo.getStandNumber()); + //如果查询条件里标准名称不为空，查询 + if (eo.getStandName() != null) queryWrapper.like("STAND_NAME",eo.getStandName()); + //如果查询条件里具体章条不为空，查询 + if (eo.getSpecificItem() != null) queryWrapper.like("specific_item",eo.getSpecificItem()); + + if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); + if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId()); + IPage page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper); + while (page.getRecords().remove(null)) ; + + return Result.success(page); + } + } + + + @ApiOperation(value = "插入技术审核符合性清单") + @PostMapping("/interpretation") + public ResponseMessage insertInterpretation(InsertEntity insertEntity) throws Exception { + + InterpretationEO eo = insertEntity.eo; + + if (eo.getPosition() == 1) { + + List entityList = new ArrayList<>(); + for (int i = 0; i < insertEntity.entityList.size(); i++) { + SarInterpretationNationalStandard obj = new SarInterpretationNationalStandard(); + BeanUtils.populate(obj, insertEntity.entityList.get(i)); + entityList.add(obj); + } + iSarInterpretationNationalStandardService.saveOrUpdateBatch(entityList); + } else { + + + List entityList = new ArrayList<>(); + for (int i = 0; i < insertEntity.entityList.size(); i++) { + SarInterpretationForeignStandard obj = new SarInterpretationForeignStandard(); + BeanUtils.populate(obj, insertEntity.entityList.get(i)); + entityList.add(obj); + } + iSarInterpretationForeignStandardService.saveOrUpdateBatch(entityList); + + } + + return Result.success(); + } +} 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..4d6131a8 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,100 @@ -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.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())); + 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/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 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + From 4b8f755b924fcda65dbd106772620ea678ce755e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 18 Mar 2022 16:51:48 +0800 Subject: [PATCH 02/13] 3-16 --- .../sarStandItems/service/impl/SarStandItemsServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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; } From 86b618eac3bbf4755be723544c14baa5a83c5b03 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Sat, 19 Mar 2022 14:48:54 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=20=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE----=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E4=BB=8E=E5=B7=B2=E7=BB=B4=E6=8A=A4=E5=8F=98?= =?UTF-8?q?=E4=B8=BA=E6=9C=AA=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarStandProjectLibraryServiceImpl.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) 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..6a305cd7 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); } From 47ebd2a68590c34b52865e58b0a714936eb15f13 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Sat, 19 Mar 2022 15:19:19 +0800 Subject: [PATCH 04/13] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandProjectLibraryServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6a305cd7..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 @@ -115,7 +115,7 @@ 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())){ + if (strings.contains(projectInfo.getCurrentNode().trim()) && !res.getCurrentNode().trim().equals(projectInfo.getCurrentNode())){ projectInfo.setFlag("0"); } From dc585e7840811521f926ceba3df1330e7a8c71d2 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 21 Mar 2022 09:47:44 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=A4=9A=E6=97=A5=E6=9C=9F=E5=8F=AA=E6=A3=80=E7=B4=A2=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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": From e2058872f49c86b8521354be00347b17c4ece00a Mon Sep 17 00:00:00 2001 From: 11528 <1152856986@qq.com> Date: Tue, 22 Mar 2022 09:56:23 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wgCommittee/service/impl/WgCommitteeServiceImpl.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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 4d6131a8..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 @@ -13,10 +13,7 @@ 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; +import java.util.*; /** *

@@ -44,7 +41,7 @@ public class WgCommitteeServiceImpl extends ServiceImpl list=new ArrayList<>(); if (null!=wgCommittee.getCommitteeIds() && !wgCommittee.getCommitteeIds().isEmpty()) { - List res=new ArrayList<>(Arrays.asList(wgCommittee.getCommitteeIds().split(","))); + List res=new ArrayList<>(Collections.singletonList(wgCommittee.getCommitteeIds())); res.stream().forEach(s -> list.add(new WgCommitteeUser().setCommitterId(s).setId(wgCommittee.getCommitteer()))); iWgCommitteeUserService.saveOrUpdateBatch(list); } @@ -61,7 +58,7 @@ public class WgCommitteeServiceImpl extends ServiceImpl save=new ArrayList<>(); if (null!=wgCommittee.getCommitteeIds() && !wgCommittee.getCommitteeIds().isEmpty()){ - List res=new ArrayList<>(Arrays.asList(wgCommittee.getCommitteeIds())); + List res=new ArrayList<>(Collections.singletonList(wgCommittee.getCommitteeIds())); res.forEach(s -> save.add(new WgCommitteeUser().setId(wgCommittee.getCommitteer()).setCommitterId(s)) ); From 9868de7e0a6b8829fd709e33887855c2d33742af Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 22 Mar 2022 11:40:37 +0800 Subject: [PATCH 07/13] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E6=94=BF=E7=AD=96=E5=BA=93=E6=B3=A8=E6=8E=89=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarLawsStandInfoServiceImpl.java | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java index be058360..34fd22d0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java @@ -151,12 +151,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(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); From 7e41d259443aa232dd91a156360f1248fc7c0c67 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 22 Mar 2022 16:57:59 +0800 Subject: [PATCH 08/13] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=20=E6=B7=BB=E5=8A=A0=20pdg?= =?UTF-8?q?=20=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-main/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 配置 From 86b9eabd038e145fabb41bd0cd5401cebec0799d Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 22 Mar 2022 17:30:29 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AB=8B=E9=A1=B9-=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=20=E4=BF=AE=E5=A4=8D=20=EF=BC=8C=E9=AB=98=E7=BA=A7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A4=B1=E6=95=88=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/slrs/processModel/entity/importExcelDTO.java | 3 ++- .../slrs/processModel/service/impl/IExportServiceImpl.java | 6 +++--- .../controller/SarStandardsInfoController.java | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) 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..4f8ae795 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 @@ -19,9 +19,10 @@ public class importExcelDTO { private String unitName; - @Excel(name = "起草责任单位" , orderNum = "3", width = 20.0) + private String unit; + @Excel(name = "起草责任单位" , orderNum = "3", width = 20.0) private String drafterName; @Excel(name = "起草人" , orderNum = "4", width = 20.0) 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/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 { From cee8fb564fc7a8b1b7ce98fa28b5711c083ac824 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 23 Mar 2022 10:23:41 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/slrs/processModel/entity/importExcelDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4f8ae795..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,12 +17,12 @@ public class importExcelDTO { @Excel(name = "制修订类型",orderNum = "2", width = 20.0) private String reviseStatus; + @Excel(name = "起草责任单位" , orderNum = "3", width = 20.0) private String unitName; private String unit; - @Excel(name = "起草责任单位" , orderNum = "3", width = 20.0) private String drafterName; @Excel(name = "起草人" , orderNum = "4", width = 20.0) From 98a47392b6ffb44b8b0c5537362b328b3ca1bb76 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 23 Mar 2022 14:53:00 +0800 Subject: [PATCH 11/13] feat: There is no way the, bug #51962 --- .../impl/SarBussionessStandServiceImpl.java | 39 ++++++++++++------- .../service/impl/SarUpdLogServiceImpl.java | 2 +- 2 files changed, 27 insertions(+), 14 deletions(-) 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 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 "英文名称"; From aefc5c72a575980ff50190f7fadf4ca3c9904177 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 23 Mar 2022 15:31:56 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E6=B8=85=E9=99=A4=E5=85=AC=E5=BC=80?= =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarPublicIdeaController.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) 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(); + } + + } From 4c40e4dbb101cf1777d3593b5170c483999609d3 Mon Sep 17 00:00:00 2001 From: 11528 <1152856986@qq.com> Date: Wed, 23 Mar 2022 15:48:03 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=BA=BA=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarPosition/entity/TsPositionRoleVO.java | 32 ++++++++++--------- .../service/impl/TsPositionServiceImpl.java | 2 ++ 2 files changed, 19 insertions(+), 15 deletions(-) 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/impl/TsPositionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java index 9d289a10..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 @@ -84,12 +84,14 @@ public class TsPositionServiceImpl extends ServiceImpl roles=getRole(tsPositionRoleVO.getPositionId());