diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java index 7fede944..a229d7d1 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java @@ -19,6 +19,7 @@ public class ActDefineStartMap { map.put("3","standardCommentProcessWorkFlow"); map.put("4","standardregulatoryinventory"); map.put("5","projectEvaluationProcess"); + map.put("6","Projectcomplianceassessment"); map.put("8","nonConformanceRectificationKey"); diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java index 8d9ef5de..670dde45 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java @@ -141,7 +141,7 @@ public class ActSarItemsEOService { // String resId = standMap.get("standId").toString(); // //此处说明是带入的形式 // sarStandardsInfoEO.setId(resId); -// SarCompResAssess assessInfoByResId = sarCompResAssessEOService.getAssessInfoByResId(resId); +// SarCompResAssess assessInfoByResId = sarCompResAssessEOService.ssessInfoByResId(resId); // if (assessInfoByResId != null) { // assessInfoByResId.setProcessState("2"); // sarCompResAssessEOService.updateByPrimaryKeySelective(assessInfoByResId); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/controller/SarBussStandAttrInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/controller/SarBussStandAttrInfoController.java new file mode 100644 index 00000000..9a1d426f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/controller/SarBussStandAttrInfoController.java @@ -0,0 +1,58 @@ +package com.adc.da.slrs.sarBussStandAttrInfo.controller; + + +import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfoEOPage; +import com.adc.da.slrs.sarBussStandAttrInfo.service.ISarBussStandAttrInfoService; +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; + +/** +*

+ * 前端控制器 + *

+* +* @author super_liu +* @since 2021-07-20 +*/ +@RestController +@Api(tags = "福田标准法规--企业标准关联国内外标准信息") +@RequestMapping("/${restPath}/lawss/SarBussStandAttrInfo") +public class SarBussStandAttrInfoController extends BaseController { + + @Autowired + private ISarBussStandAttrInfoService sarBussStandAttrInfoEOService; + + @ApiOperation(value = "|SarBussStandAttrInfoEO|分页查询") + @GetMapping("/page") +// @RequiresPermissions("lawss:sarBussStandAttrInfo:page") + public ResponseMessage> page(SarBussStandAttrInfoEOPage page) throws Exception { + List rows = sarBussStandAttrInfoEOService.queryByPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + + @ApiOperation(value = "|SarBussStandAttrInfoEO|查询") + @GetMapping("") +// @RequiresPermissions("lawss:sarBussStandAttrInfo:list") + public ResponseMessage> list(SarBussStandAttrInfoEOPage page) throws Exception { + return Result.success(sarBussStandAttrInfoEOService.queryByList(page)); + } + + @ApiOperation(value = "|SarBussStandAttrInfoEO|新增") + @PostMapping(consumes = "application/json;charset=UTF-8") +// @RequiresPermissions("lawss:sarBussStandAttrInfo:save") + public ResponseMessage create(@RequestBody SarBussStandAttrInfo sarBussStandAttrInfoEO) throws Exception { + sarBussStandAttrInfoEOService.insertSelective(sarBussStandAttrInfoEO); + return Result.success(sarBussStandAttrInfoEO); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java new file mode 100644 index 00000000..3be1eb92 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java @@ -0,0 +1,32 @@ +package com.adc.da.slrs.sarBussStandAttrInfo.dao; + +import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo; +import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfoEOPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Map; + +/** + *

+ * Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-07-20 + */ +@Repository +public interface SarBussStandAttrInfoDao extends BaseMapper { + + List queryByList(SarBussStandAttrInfoEOPage page); + + List queryByPage(SarBussStandAttrInfoEOPage page); + + int insertSelective(SarBussStandAttrInfo sarBussStandAttrInfo); + + Map selectStandFieldAndData(@Param("fieldInfo") String fieldInfo, @Param("standId") String standId); + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java new file mode 100644 index 00000000..b0019e1d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java @@ -0,0 +1,111 @@ +package com.adc.da.slrs.sarBussStandAttrInfo.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.time.LocalDateTime; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableField; +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; + +/** + *

+ * + *

+ * + * @author super_liu + * @since 2021-07-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="SarBussStandAttrInfo对象", description="") +public class SarBussStandAttrInfo extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + @TableField("ID") + private String id; + + @ApiModelProperty(value = "标准基础表主键") + @TableField("STAND_ID") + private String standId; + + @TableField("CREATION_USER") + private String creationUser; + + @ApiModelProperty(value = "是否有效") + @TableField("VALID_FLAG") + private String validFlag; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATION_TIME") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date creationTime; + + @ApiModelProperty(value = "修改时间") + @TableField("MODIFY_TIME") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date modifyTime; +// +// @TableField("SVPPS") +// private String svpps; +// +// @TableField("GFXYYWJ") +// private String gfxyywj; +// +// @TableField("ZRBM") +// private String zrbm; +// +// @TableField("FZRQ") +// private Date fzrq; +// +// @TableField("FSRQ") +// private Date fsrq; +// +// @TableField("QBMJ") +// private String qbmj; +// +// @TableField("QBSQ") +// private String qbsq; +// +// @TableField("QBWB") +// private String qbwb; +// +// @TableField("GCWB") +// private String gcwb; +// +// @TableField("ZYQCR") +// private String zyqcr; +// +// @TableField("QCFBW") +// private String qcfbw; +// +// @TableField("XGLC") +// private String xglc; +// +// @TableField("XGBM") +// private String xgbm; +// +// @TableField("XHQBM") +// private String xhqbm; +// +// @TableField("ZQCBM") +// private String zqcbm; +// +// @TableField("QTQCR") +// private String qtqcr; +// +// @TableField("WFSPJS") +// private String wfspjs; +// +// @TableField("XGJH") +// private String xgjh; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoEOPage.java new file mode 100644 index 00000000..94462e48 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoEOPage.java @@ -0,0 +1,158 @@ +package com.adc.da.slrs.sarBussStandAttrInfo.entity; + +import com.adc.da.base.page.BasePage; + +/** + * 功能：SAR_BUSS_STAND_ATTR_INFO SarBussStandAttrInfoEOPage
+ * 作者：code generator
+ * 日期： 2020-10-27
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */ +public class SarBussStandAttrInfoEOPage extends BasePage { + + private String id; + private String idOperator = "="; + private String standId; + private String standIdOperator = "="; + private String creationUser; + private String creationUserOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + + public String getStandId() { + return this.standId; + } + + public void setStandId(String standId) { + this.standId = standId; + } + + public String getStandIdOperator() { + return this.standIdOperator; + } + + public void setStandIdOperator(String standIdOperator) { + this.standIdOperator = standIdOperator; + } + + public String getCreationUser() { + return this.creationUser; + } + + public void setCreationUser(String creationUser) { + this.creationUser = creationUser; + } + + public String getCreationUserOperator() { + return this.creationUserOperator; + } + + public void setCreationUserOperator(String creationUserOperator) { + this.creationUserOperator = creationUserOperator; + } + + public String getValidFlag() { + return this.validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return this.validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/ISarBussStandAttrInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/ISarBussStandAttrInfoService.java new file mode 100644 index 00000000..b34a1f17 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/ISarBussStandAttrInfoService.java @@ -0,0 +1,24 @@ +package com.adc.da.slrs.sarBussStandAttrInfo.service; + +import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo; +import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfoEOPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author super_liu + * @since 2021-07-20 + */ +public interface ISarBussStandAttrInfoService extends IService { + + List queryByList(SarBussStandAttrInfoEOPage page); + + List queryByPage(SarBussStandAttrInfoEOPage page); + + int insertSelective(SarBussStandAttrInfo sarBussStandAttrInfo); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/impl/SarBussStandAttrInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/impl/SarBussStandAttrInfoServiceImpl.java new file mode 100644 index 00000000..3bc28e05 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/impl/SarBussStandAttrInfoServiceImpl.java @@ -0,0 +1,37 @@ +package com.adc.da.slrs.sarBussStandAttrInfo.service.impl; + +import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo; +import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao; +import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfoEOPage; +import com.adc.da.slrs.sarBussStandAttrInfo.service.ISarBussStandAttrInfoService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author super_liu + * @since 2021-07-20 + */ +@Service +public class SarBussStandAttrInfoServiceImpl extends ServiceImpl implements ISarBussStandAttrInfoService { + + @Override + public List queryByList(SarBussStandAttrInfoEOPage page){ + return this.baseMapper.queryByList(page); + } + + @Override + public List queryByPage(SarBussStandAttrInfoEOPage page){ + return this.baseMapper.queryByPage(page); + } + + @Override + public int insertSelective(SarBussStandAttrInfo sarBussStandAttrInfo){ + return this.baseMapper.insertSelective(sarBussStandAttrInfo); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index dc247155..893c0ca1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -1,12 +1,28 @@ package com.adc.da.slrs.sarBussionessStand.controller; +import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarResource.service.ITsResourceService; +import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO; +import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; +import com.adc.da.sys.util.LoginUserUtil; +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.util.utils.StringUtils; +import com.adc.da.utils.util.SarAdvanceSearchUtil; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; +import java.util.List; + /** *

* 企业标准信息表 前端控制器 @@ -20,4 +36,48 @@ import com.adc.da.base.web.BaseController; @RequestMapping("/${restPath}/lawss/sarBussionessStand") public class SarBussionessStandController extends BaseController { + @Autowired + private ISarBussionessStandService sarBussionessStandEOService; + + @Autowired + private ITsResourceService iTsResourceService; + + /** + * 自定义分页查询列表 + * @param page 标准信息 + * @return + * @author gaoyan + * date 2018-09-04 + */ + @ApiOperation(value = "|SarBussionessStandEO|自定义分页查询列表") + @GetMapping("/getSarBussionStandPage") + //@RequiresPermissions("lawss:sarBussionessStand:getSarBussionStandPage") + public ResponseMessage> getSarBussionStandPage(SarBussionessStandEOPage page) throws Exception { + if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { + List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); + String advanceStr = SarAdvanceSearchUtil.createSql(searchList); + if (StringUtils.isNotBlank(advanceStr)) { + page.setAdvanceSearchStr(advanceStr); + } else { + page.setAdvanceSearchStr(null); + } + } + page.setUserId(LoginUserUtil.getUserId()); + if(StringUtils.isNotBlank(page.getPaixu())){ + String sql = page.getPaixu()+" "+page.getShunxu(); + page.setSql(sql); + }else{ + page.setOrderBy("SAR_BUSSIONESS_STAND.issue_time is null,SAR_BUSSIONESS_STAND.issue_time desc,SAR_BUSSIONESS_STAND.id"); + } + List getMenuIdList = iTsResourceService.queryRoleMenuIdList("BUSINESS_STAND",page.getMenuId()); + if(getMenuIdList != null && !getMenuIdList.isEmpty()){ + page.setMenuRoleList(getMenuIdList); + List rows = sarBussionessStandEOService.getSarBussionStandPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } else { + return Result.success(getPageInfo(page.getPager(), null)); + } + } + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java index 782a06da..621d3f1e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarBussionessStand.dao; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; import java.util.List; @@ -14,7 +15,13 @@ import java.util.List; * @author super_liu * @since 2021-07-13 */ +@Repository public interface SarBussionessStandDao extends BaseMapper { List queryByList(SarBussionessStandEOPage sarBussionessStandEOPage); + + int getBussionessStandInfoCount(SarBussionessStandEOPage page); + + List getBussionessStandInfoPage(SarBussionessStandEOPage page); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index 3277b429..3bb4f2ab 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -17,4 +17,6 @@ import java.util.List; public interface ISarBussionessStandService extends IService { List queryByList(SarBussionessStandEOPage sarBussionessStandEOPage); + + List getSarBussionStandPage(SarBussionessStandEOPage page) throws Exception; } 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 bc23039e..d9c6c3ab 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 @@ -1,13 +1,28 @@ package com.adc.da.slrs.sarBussionessStand.service.impl; +import com.adc.da.common.SelectionTypeEnum; +import com.adc.da.person.service.IPersonCollectEOService; +import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarResource.entity.TsResource; +import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; +import com.adc.da.slrs.sarUser.service.ITsUserService; +import com.adc.da.slrs.sysInfo.service.SysInfoEOService; +import com.adc.da.utils.util.FieldConvertUtil; +import com.adc.da.utils.util.InitStandAttrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.sql.Clob; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -20,6 +35,110 @@ import java.util.List; @Service public class SarBussionessStandServiceImpl extends ServiceImpl implements ISarBussionessStandService { + @Autowired + private ITsUserService tsUserService; + + @Autowired + private ITsResourceService iTsResourceService; + + + @Autowired + private SysInfoEOService sysInfoEOService; + + @Autowired + private IPersonCollectEOService personCollectEOService; + + @Autowired + private SarBussStandAttrInfoDao sarBussStandAttrInfoEODao; + + + @Override + public List getSarBussionStandPage(SarBussionessStandEOPage page) throws Exception { + if (StringUtils.isNotBlank(page.getMenuId())) { + List getMenuIdList = tsUserService.getResourceId(new TsResource()); +// List getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null); + if (getMenuIdList != null && !getMenuIdList.isEmpty()) { + page.setMenuRoleList(getMenuIdList); + } else { + page.setMenuRoleList(null); + } + List ids = iTsResourceService.getChildMenuList(page.getMenuId()); + if (ids != null && !ids.isEmpty()) { + page.setMenuAllChildrenIdList(ids); + } + } + Integer rowCount = this.baseMapper.getBussionessStandInfoCount(page); + page.getPager().setRowCount(rowCount); + List sarlist = this.baseMapper.getBussionessStandInfoPage(page); + attrInfo(sarlist); + return sarlist; + } + + /*** + * @Description: 处理属性表数据 + * @Param: [sarlist] + * @Return: void + */ + public void attrInfo (List sarlist) throws Exception { + for(SarBussionessStand row : sarlist){ + attrInfoDetails(row); + } + } + + public void attrInfoDetails (SarBussionessStand row) throws Exception { + String fieldInfo = InitStandAttrUtil.queryFieldBuss; + String collectId = personCollectEOService.queryCollectByUserAndId(row.getId()); + row.setCollectId(collectId); + // 查询属性表数据 + if (StringUtils.isNotBlank(fieldInfo)) { + Map getAttrMap = sarBussStandAttrInfoEODao.selectStandFieldAndData(fieldInfo,row.getId()); + if (InitStandAttrUtil.clobFieldListBuss != null && !InitStandAttrUtil.clobFieldListBuss.isEmpty()) { + // 遍历修改所有clob类型的值 + for (String clobField : InitStandAttrUtil.clobFieldListBuss) { + Clob clobValue = (Clob) getAttrMap.get(clobField); + String fieldValue = FieldConvertUtil.ClobToString(clobValue); + getAttrMap.put(clobField,fieldValue); + } + } + // 组织机构和人员 + Map newMap = new HashMap<>(); + if(getAttrMap != null){ + for (Map.Entry entry : getAttrMap.entrySet()) { + String name = entry.getKey(); + Object value1 = entry.getValue(); + if (value1 != null && value1.toString().equals("\"null\"")){ + entry.setValue(""); + } + if ("SVPPS".equals(name)) { + Object value = entry.getValue(); + if (value != null && StringUtils.isNotBlank(value.toString())) { + value = sysInfoEOService.getSvppsNamesByIds(value.toString()); + } + newMap.put(name + "Name",value); + } else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) { + String value = entry.getValue().toString(); + String selVal = InitStandAttrUtil.selectFieldMapBuss.get(name); + if (SelectionTypeEnum.ORGLIST.getValue().equals(selVal)) { + value = sysInfoEOService.getOrgNamesByIds(value); + newMap.put(name + "Name",value); + } else if (SelectionTypeEnum.USERLIST.getValue().equals(selVal)) { + value = sysInfoEOService.getUserNamesByIds(value); + newMap.put(name + "Name",value); + } else if (SelectionTypeEnum.ROLELIST.getValue().equals(selVal)) { + value = sysInfoEOService.getRoleNamesByIds(value); + newMap.put(name + "Name",value); + } + } + } + getAttrMap.putAll(newMap); + } + + row.setAttrInfoMap(getAttrMap); + } + } + + + @Override public List queryByList(SarBussionessStandEOPage sarBussionessStandEOPage){ return this.baseMapper.queryByList(sarBussionessStandEOPage); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java index 22150189..beaa8d70 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java @@ -50,10 +50,10 @@ public class TsInstitutionController extends BaseController { * 查询所有机构和人员 * @return ResponseMessage> */ - @ApiOperation("查询所有机构和人员") + @ApiOperation("查询所有机构和人员或根据名称查询") @GetMapping("/institutionAndUser") - public ResponseMessage> getInstitutionAndUser(){ - List institutions=tsInstitutionService.getInstitutionAndUser(); + public ResponseMessage> getInstitutionAndUser(String userName){ + List institutions=tsInstitutionService.getInstitutionAndUser(userName); return Result.success(institutions); } @@ -76,6 +76,19 @@ public class TsInstitutionController extends BaseController { return Result.success(); } + @ApiOperation("获得下一级的部门和人员") + @GetMapping("/getNext") + public List getNext(String institutionId){ + return tsInstitutionService.getNext(institutionId); + } + + @ApiOperation("获得第一级部门目录") + @GetMapping("/getFirstInstitution") + public List getFirstInstitution(){ + return tsInstitutionService.getFirst(); + } + + public static void main(String[] args) { // System.out.println(json); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java index 91b59c27..8b8d2ee3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java @@ -16,12 +16,26 @@ import java.util.List; * @since 2021-06-22 */ public interface TsInstitutionDao extends BaseMapper { + /** + * 根据部门id查询此部门的子一级部门 + * @return + */ + List selectNextInstitution(String institutionId); + + /** + * 根据部门id查询此部门的子一级人员 + * @return + */ + List selectNextUser(String institutionId); + + + /** * 查询最高级机构及其人员 * @return List */ - List selectRootAndUser(); + List selectRootAndUser(String userName); /** * 根据父节点查询机构及其人员 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java index 51c3673c..5af267c8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java @@ -15,7 +15,7 @@ import java.util.List; /** *

- * + * *

* * @author zyl @@ -59,6 +59,11 @@ public class TsInstitution extends BaseEntity { @ApiModelProperty("是否有子节点(1有，0没有)") private String hasChild; + + @ApiModelProperty("用户") + private TsUserVO tsUserVO; + + public TsInstitution() { } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java index 2bd56f28..688cc318 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java @@ -20,7 +20,7 @@ public interface ITsInstitutionService extends IService { */ List getInstitution(); - List getInstitutionAndUser(); + List getInstitutionAndUser(String userName); /** * 批量插入机构 @@ -29,4 +29,17 @@ public interface ITsInstitutionService extends IService { void batchInsert(List tsInstitutions); public void parseInstitution() throws Exception; + + /** + * 通过部门id获取他的子一级部门和人员 + * @param institutionId + * @return + */ + public List getNext(String institutionId); + + /** + * 获得第一级的部门 + * @return + */ + public List getFirst(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java index b619ff0c..2e3c47cd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java @@ -46,6 +46,9 @@ public class TsInstitutionServiceImpl extends ServiceImpl getInstitutionAndUser() { + public List getInstitutionAndUser(String userName) { //查询第一层机构 - List institutionRoot=tsInstitutionDao.selectRootAndUser(); + List institutionRoot=tsInstitutionDao.selectRootAndUser(userName); + + //把查到的数据结构修改,把用户放 for(TsInstitution tsInstitution:institutionRoot){ tsInstitution.setDisabled(true); - tsInstitution.setChildren(recursionGetInstitutionAndUser(tsInstitution)); + tsInstitution.setChildren( recursionGetInstitutionAndUser(tsInstitution) ); for(TsUserVO user:tsInstitution.getUsers()){ if(tsInstitution.getChildren()==null){ tsInstitution.setChildren(new ArrayList<>()); @@ -145,6 +152,7 @@ public class TsInstitutionServiceImpl extends ServiceImpl institutionObject=new ArrayList<>(); + //通过以此部门id作为父id查询它的子部门 List tsInstitutions=tsInstitutionDao.selectAndUserByParent(tsInstitution.getId()); for(TsInstitution tsInstitutionNode:tsInstitutions){ @@ -179,5 +187,30 @@ public class TsInstitutionServiceImpl extends ServiceImpl getNext(String institutionId){ + List tsInstitutions = tsInstitutionDao.selectNextInstitution(institutionId); + List tsUsers=tsInstitutionDao.selectNextUser(institutionId); + + + for(TsInstitution tsInstitution:tsInstitutions){ + tsInstitution.setDisabled(true); + } + tsInstitutions.addAll(tsUsers); + return tsInstitutions; + } + + + public List getFirst(){ + //查询第一层机构 + List tsInstitutions = tsInstitutionDao.selectRootAndUser(null); + for(TsInstitution tsInstitution:tsInstitutions){ + tsInstitution.setDisabled(true); + } + return tsInstitutions; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java index 17e132b4..e97d82df 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -80,4 +81,6 @@ public class LawsDto { @ExcelProperty(value = "卡车vpps中文名称", index = 13) @ApiModelProperty(value = "卡车vpps中文名称") private String KCCVPPSCN; + @ApiModelProperty(value = "责任工程师") + private String responsibleEngineer; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index 737da1a3..e9e145da 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -135,7 +135,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl AllSelectD(Integer pages, Integer size, String sortKey, + public IPage AllSelectD(Integer page, Integer pageSize, String sortKey, String countryArea,String projectName, String detailedList,String detailedListName) { QueryWrapper wrapper = new QueryWrapper<>(); @@ -151,8 +151,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl page = new Page<>(pages, size); - IPage userIPage = sarLawsDetailedListDao.selectPage(page, wrapper); + Page pageRes = new Page<>(page, pageSize); + IPage userIPage = sarLawsDetailedListDao.selectPage(pageRes, wrapper); if ("1".equals(sortKey)){ Map map= iDicTypeEOService.getDicTypeListCode(); List list= userIPage.getRecords(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java index 7b10eccb..15b389c8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java @@ -31,10 +31,19 @@ public class SarModelTreeController extends BaseController { @Autowired private ISarModelTreeService iSarModelTreeService; - @ApiOperation("查询所有资源") + @ApiOperation("查询父所有资源") @GetMapping("/list") public ResponseMessage> getAll(SarModelTree sarVppsTree){ List tsResources = iSarModelTreeService.getAll(sarVppsTree); return Result.success(tsResources); } + + @ApiOperation("根据父ID查询子所有资源") + @GetMapping("/childByList") + public ResponseMessage> childByList(String ids){ + SarModelTree tree = new SarModelTree(); + tree.setId(ids); + List tsResources = iSarModelTreeService.recursionGetChildren(tree); + return Result.success(tsResources); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModelTreeService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModelTreeService.java index b1d2c3f3..e17248c0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModelTreeService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModelTreeService.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarModelTree.service; import com.adc.da.slrs.sarModelTree.entity.SarModelTree; +import com.adc.da.slrs.sarVppsTree.entity.SarVppsTree; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -17,4 +18,5 @@ public interface ISarModelTreeService extends IService { List getAll(SarModelTree sarModelTree); + List recursionGetChildren(SarModelTree parent); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java index e3e3c907..a9703566 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java @@ -29,9 +29,9 @@ public class SarModelTreeServiceImpl extends ServiceImpl tsResourceQueryWrapper=new QueryWrapper<>(); tsResourceQueryWrapper.isNull("PID"); List list = this.baseMapper.selectList(tsResourceQueryWrapper); - for(SarModelTree tree:list){ - tree.setChildren(recursionGetChildren((tree))); - } +// for(SarModelTree tree:list){ +// tree.setChildren(recursionGetChildren((tree))); +// } return list; } @@ -40,10 +40,11 @@ public class SarModelTreeServiceImpl extends ServiceImpl */ - private List recursionGetChildren(SarModelTree parent){ + @Override + public List recursionGetChildren(SarModelTree parent){ QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>(); sarMenuQueryWrapper.orderByAsc("SORT"); - sarMenuQueryWrapper.eq("PID",parent.getId()); + sarMenuQueryWrapper.in("PID",parent.getId()); List children=this.baseMapper.selectList(sarMenuQueryWrapper); for(SarModelTree sarMenu:children){ sarMenu.setChildren(recursionGetChildren((sarMenu))); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserStarServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserStarServiceImpl.java index 890d219d..d6cdc8c5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserStarServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserStarServiceImpl.java @@ -51,6 +51,29 @@ public class SarUserStarServiceImpl extends ServiceImpl> getUserStarList(PersonCollectEO personCollectEO) { +// if (personCollectEO.getUserId() == null) { +// return Result.error("userId不能为空"); +// } else { +// +// QueryWrapper wrapper = new QueryWrapper<>(); +// wrapper.eq("user_id", personCollectEO.getUserId()); +// if(personCollectEO.getCollectType()!=null)wrapper.like("COLLECT_TYPE",personCollectEO.getCollectType()); +// if(personCollectEO.getCollectTitle()!=null)wrapper.like("name",personCollectEO.getCollectTitle()); +// if(sarUserStarEO.getModular()!=null)wrapper.like("modular",sarUserStarEO.getModular()); +// if(sarUserStarEO.getInfo()!=null)wrapper.like("info",sarUserStarEO.getInfo()); +// if(sarUserStarEO.getUrl()!=null)wrapper.like("url",sarUserStarEO.getUrl()); +// IPage page = iSarUserStarService.page(new Page<>(sarUserStarEO.getCurrent(), sarUserStarEO.getSize()), wrapper); +// while (page.getRecords().remove(null)) ; +// return Result.success(page); +// } +// } + + + + + @Override public ResponseMessage> deleteList(@RequestBody SarUserStarEO sarUserStars) { if (sarUserStars.getUserId() == null) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java index 515475f3..57068a2b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java @@ -156,5 +156,9 @@ public class SarStandItems extends BaseEntity { @TableField(exist = false) private SarCompStatusInfo pgForm; + //责任工程师 + private String responsibleEngineer; + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java index f173797e..b7d68da5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java @@ -32,7 +32,7 @@ public class SarStandItemsDto { private String responsibleUnit; - + private String responsibleEngineer; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index 29a332d0..39d3810c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -7,6 +7,7 @@ import com.adc.da.slrs.sarStandProjectLibrary.service.impl.SarStandProjectLibrar import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; @@ -87,7 +88,13 @@ public class SarStandProjectLibraryController extends BaseController pageres=new Page<>(); + pageres.setRecords(listTemp); + pageres.setPages(list1.getPages()); + pageres.setTotal(list1.getTotal()); + pageres.setCurrent(list1.getCurrent()); + pageres.setSize(list1.getSize()); + return Result.success("200",pageres); } /** * diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java index 61b9e5c7..91ead351 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java @@ -34,7 +34,9 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; import java.net.URLEncoder; +import java.sql.Timestamp; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -55,6 +57,18 @@ public class SarStandUnqualifiedController extends BaseController add(@RequestBody List sarStandUnqualified){ + sarStandUnqualified.forEach(sarStandUnqualified1 -> sarStandUnqualified1.setCreateTime(new Date())); + if (sarStandUnqualifiedService.saveBatch(sarStandUnqualified)) { + return Result.success("新增成功"); + } + else{ + return Result.error("新增失败"); + } + } + /** * 分页查询未符合项 * @param sarStandUnqualifiedPage：筛选、分页信息 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java index c63ef3a8..5d7791d0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java @@ -1,7 +1,11 @@ package com.adc.da.slrs.sarStandUnqualified.dao; import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified; +import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualifiedPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Mapper; /** @@ -14,6 +18,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface SarStandUnqualifiedDao extends BaseMapper { + IPage getAllDatasByPage(Page page,@Param("sar") SarStandUnqualifiedPage sarStandUnqualified); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index 2dd65a21..f45817e6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -3,11 +3,13 @@ package com.adc.da.slrs.sarStandUnqualified.entity; import com.adc.da.base.entity.BaseEntity; import java.sql.Timestamp; +import java.util.Date; import com.adc.da.slrs.sarStandUnqualified.utils.ProductTypeConverter; import com.adc.da.slrs.sarStandUnqualified.utils.TimestampConverter; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; @@ -84,7 +86,7 @@ public class SarStandUnqualified extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("CREATE_TIME") - private Timestamp createTime; + private Date createTime; @ExcelIgnore @ApiModelProperty(value = "关闭状态（1为开启，2为关闭）") @@ -96,14 +98,14 @@ public class SarStandUnqualified extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("ACTUAL_CLOSE_TIME") - private Timestamp actualCloseTime; + private Date actualCloseTime; @ExcelProperty(value = "计划关闭时间",converter = TimestampConverter.class) @ApiModelProperty(value = "计划关闭时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("PLAN_CLOSE_TIME") - private Timestamp planCloseTime; + private Date planCloseTime; @ApiModelProperty(value = "未符合原因") @TableField("REASON") @@ -133,8 +135,18 @@ public class SarStandUnqualified extends BaseEntity { @ExcelIgnore @ApiModelProperty(value = "主键") - @TableId("ID") + @TableId(type = IdType.UUID) private String id; + @ApiModelProperty(value = "质量工程师") + private String qaEngineerName; + + @ApiModelProperty(value = "认证工程师") + private String authEngineerName; + + @ApiModelProperty(value = "责任工程师") + private String dutyEngineerName; + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/ISarStandUnqualifiedService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/ISarStandUnqualifiedService.java index 4d7873ca..df5fa169 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/ISarStandUnqualifiedService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/ISarStandUnqualifiedService.java @@ -46,4 +46,5 @@ public interface ISarStandUnqualifiedService extends IService */ List getStandUnqualifiedExcelData(StandUnqualifiedExcelVO standUnqualifiedExcelVO); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java index bcf5128c..1c73a0d7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java @@ -144,4 +144,3 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl @@ -170,10 +169,14 @@ public class SarStandardComplianceAssessResultController { } @ApiOperation(value = "插入标准涉及项目符合性清单") - @PostMapping("/product") - public ResponseMessage insertProduct(List eo) throws Exception { + @PostMapping("/add") + public ResponseMessage insertProduct(@RequestBody List eo) throws Exception { - iSarStandardComplianceProductAssessService.saveOrUpdateBatch(eo); + eo.forEach(sarStandardComplianceProductAssess -> { + sarStandardComplianceProductAssess.setId(UUIDUtils.randomUUID(32)); + sarStandardComplianceProductAssess.setInterpretationTime(new Date()); + }); + iSarStandardComplianceProductAssessService.saveBatch(eo); return Result.success(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java index bfaa990b..706bde15 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java @@ -109,4 +109,6 @@ public class SarStandardComplianceProductAssess extends BaseEntity { private Date interpretationTime; + private String id; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java index 6289f618..11a87b73 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java @@ -51,8 +51,12 @@ public class TsUrlController{ @ApiOperation(value="第三方链接-添加", notes="第三方链接-添加") @PostMapping(value = "/add") public ResponseMessage add(@RequestBody TsUrl tsUrl) { - int orderBy=tsUrlService.getMaxOrderBy(); - tsUrl.setOrderBy(orderBy+1); + String orderBy=tsUrlService.getMaxOrderBy(); + if (null!=orderBy) { + tsUrl.setOrderBy(Integer.valueOf(orderBy) + 1); + }else { + tsUrl.setOrderBy(1); + } tsUrlService.save(tsUrl); return Result.success(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/dao/TsUrlDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/dao/TsUrlDao.java index ab94703f..e3ecaf62 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/dao/TsUrlDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/dao/TsUrlDao.java @@ -18,5 +18,5 @@ public interface TsUrlDao extends BaseMapper { * @return int */ @Select("select max(order_by) from ts_url") - int getMaxOrderBy(); + String getMaxOrderBy(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/ITsUrlService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/ITsUrlService.java index bfe81d66..ab1bf403 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/ITsUrlService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/ITsUrlService.java @@ -20,7 +20,7 @@ public interface ITsUrlService extends IService { * 获取最大排序号 * @return int */ - int getMaxOrderBy(); + String getMaxOrderBy(); /** * 排序 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/impl/TsUrlServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/impl/TsUrlServiceImpl.java index 0480a39b..f4ac3d98 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/impl/TsUrlServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/impl/TsUrlServiceImpl.java @@ -31,7 +31,7 @@ public class TsUrlServiceImpl extends ServiceImpl implements IT * @return int */ @Override - public int getMaxOrderBy() { + public String getMaxOrderBy() { return tsUrlDao.getMaxOrderBy(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java index 9f78cba2..ccd79b39 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java @@ -31,11 +31,22 @@ public class SarVppsTreeController extends BaseController { @Autowired private ISarVppsTreeService iSarVppsTreeService; - @ApiOperation("查询所有资源") + @ApiOperation("查询父所有资源") @GetMapping("/list") public ResponseMessage> getAll(SarVppsTree sarVppsTree){ List tsResources = iSarVppsTreeService.getAll(sarVppsTree); return Result.success(tsResources); } + @ApiOperation("根据父ID查询子所有资源") + @GetMapping("/childByList") + public ResponseMessage> childByList(String ids){ + SarVppsTree tree = new SarVppsTree(); + tree.setId(ids); + List tsResources = iSarVppsTreeService.recursionGetChildren(tree); + return Result.success(tsResources); + } + + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/ISarVppsTreeService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/ISarVppsTreeService.java index 910b46ec..77fb0689 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/ISarVppsTreeService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/ISarVppsTreeService.java @@ -16,4 +16,6 @@ import java.util.List; public interface ISarVppsTreeService extends IService { List getAll(SarVppsTree sarVppsTree); + + List recursionGetChildren(SarVppsTree parent); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java index 1a7b51d4..32c8c76d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java @@ -29,9 +29,9 @@ public class SarVppsTreeServiceImpl extends ServiceImpl tsResourceQueryWrapper=new QueryWrapper<>(); tsResourceQueryWrapper.isNull("PID"); List list = this.baseMapper.selectList(tsResourceQueryWrapper); - for(SarVppsTree tree:list){ - tree.setChildren(recursionGetChildren((tree))); - } +// for(SarVppsTree tree:list){ +// tree.setChildren(recursionGetChildren((tree))); +// } return list; } @@ -40,10 +40,11 @@ public class SarVppsTreeServiceImpl extends ServiceImpl */ - private List recursionGetChildren(SarVppsTree parent){ + @Override + public List recursionGetChildren(SarVppsTree parent){ QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>(); sarMenuQueryWrapper.orderByAsc("SORT"); - sarMenuQueryWrapper.eq("PID",parent.getId()); + sarMenuQueryWrapper.in("PID",parent.getId()); List children=this.baseMapper.selectList(sarMenuQueryWrapper); for(SarVppsTree sarMenu:children){ sarMenu.setChildren(recursionGetChildren((sarMenu))); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index f42fb7ba..a77962cc 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -643,7 +643,7 @@ + select count(1) from SAR_BUSS_STAND_ATTR_INFO + + + + + + + + + + + alter table SAR_BUSS_STAND_ATTR_INFO + add ${fieldInfo} + + + + + alter table SAR_BUSS_STAND_ATTR_INFO + drop COLUMN ${fieldInfo} + + + + + + + + ALTER table SAR_BUSS_STAND_ATTR_INFO + MODIFY ${fieldInfo} + + + + + + + insert into SAR_BUSS_STAND_ATTR_INFO(${fieldInfo}) + values (${fieldValue}) + + + + delete from SAR_BUSS_STAND_ATTR_INFO + where stand_id = #{standId} + + + + update SAR_BUSS_STAND_ATTR_INFO set ${field}=#{value} + where stand_id = #{standId} + + + + \ No newline at end of file diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml index 7b91c84b..1e870059 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml @@ -14,11 +14,44 @@ + + + + + + + + + + + + + + + + + + + + + - - INSERT INTO sar_laws_attr_detailed_list ( id, number, detailed_list_id, stand_id ,putTime,xcxssrq,zccssrq) VALUES + INSERT INTO sar_laws_attr_detailed_list ( id, number, detailed_list_id, stand_id ) VALUES - (#{list.id,jdbcType=VARCHAR}, #{list.number}, #{list.detailedListId,jdbcType=VARCHAR}, #{list.standId,jdbcType=VARCHAR},#{list.putTime,jdbcType=VARCHAR},#{list.xcxssrq,jdbcType=VARCHAR},#{list.zccssrq,jdbcType=VARCHAR}) + (#{list.id,jdbcType=VARCHAR}, #{list.number}, #{list.detailedListId,jdbcType=VARCHAR}, #{list.standId,jdbcType=VARCHAR}) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index 6e5cdb19..2a597c7b 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -9,14 +9,15 @@ - - - - - - - - + + delete from sar_stand_project_relation where stand_id in ( diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml index b90da545..da1eb9a9 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml @@ -2,4 +2,31 @@ + + diff --git a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java index 1d3054c2..600d4d9b 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java @@ -1,23 +1,21 @@ package com.adc.da.person.controller; import com.adc.da.base.web.BaseController; -import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; -import com.adc.da.person.entity.PersonCollectEO; +import com.adc.da.person.entity.TsPersonCollect; import com.adc.da.person.page.PersonCollectEOPage; import com.adc.da.person.service.IPersonCollectEOService; import com.adc.da.util.LoginUserUtil; import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -28,7 +26,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; @RestController @RequestMapping("/${restPath}/person/personCollect") @Api(description = "|PersonCollectEO|") -public class PersonCollectEOController extends BaseController { +public class PersonCollectEOController extends BaseController { private static final Logger logger = LoggerFactory.getLogger(PersonCollectEOController.class); @@ -45,45 +43,10 @@ public class PersonCollectEOController extends BaseController { **/ @ApiOperation(value = "|PersonCollectEO|分页查询") @GetMapping("/page") - public ResponseMessage> page(Integer pageNo, Integer pageSize, String modeType, String collectTitle) throws Exception { - PersonCollectEOPage page = new PersonCollectEOPage(); - if (StringUtils.isNotEmpty(modeType)) { - List collectTypes = new ArrayList<>(); - switch (modeType) { - case "STAND": - collectTypes.add("INLAND_STAND"); - collectTypes.add("FOREIGN_STAND"); - collectTypes.add("BUSINESS_STAND"); - break; - case "LAWS": - collectTypes.add("INLAND_LAWS"); - collectTypes.add("FOREIGN_LAWS"); - break; - case "MSG": - collectTypes.add("INLAND_MSG"); - collectTypes.add("FOREIGN_MSG"); - collectTypes.add("RESOURCE_MSG"); - break; - default:break; - } - page.setCollectTypeList(collectTypes); - } - if (pageNo != null) { - page.setPage(pageNo); - }else{ - page.setPage(1); - } - if (pageSize != null) { - page.setPageSize(pageSize); - }else{ - page.setPageSize(10); - } - if (StringUtils.isNotEmpty(collectTitle)) { - page.setCollectTitle(collectTitle); - } - page.setUserId(LoginUserUtil.getUserId()); - List rows = personCollectEOService.queryByPersonCollectPage(page); - return Result.success(getPageInfo(page.getPager(), rows)); + public ResponseMessage> page(Integer pageNo, Integer pageSize, String collectTitle, String userId) throws Exception { + + + return personCollectEOService.queryCollectByWrapper(pageNo, pageSize,collectTitle,userId); } @@ -91,7 +54,7 @@ public class PersonCollectEOController extends BaseController { @ApiOperation(value = "|PersonCollectEO|查询") @GetMapping("") // @RequiresPermissions("person:personCollect:list") - public ResponseMessage> list(PersonCollectEOPage page) throws Exception { + public ResponseMessage> list(PersonCollectEOPage page) throws Exception { return Result.success(personCollectEOService.queryByList(page)); } @@ -99,39 +62,43 @@ public class PersonCollectEOController extends BaseController { @ApiOperation(value = "|PersonCollectEO|详情") @GetMapping("/{id}") // @RequiresPermissions("person:personCollect:get") - public ResponseMessage find(@PathVariable String id) throws Exception { + public ResponseMessage find(@PathVariable String id) throws Exception { return Result.success(personCollectEOService.getById(id)); } /** * 刘寅楠 - * @param personCollectEO + * 收藏国内标准法规 + * @param tsPersonCollect * @return com.adc.da.person.entity.PersonCollectEO * @throws Exception */ @ApiOperation(value = "|PersonCollectEO|新增") @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) // @RequiresPermissions("person:personCollect:create") - public ResponseMessage create(@RequestBody PersonCollectEO personCollectEO) throws Exception { - String userId = LoginUserUtil.getUserId(); - personCollectEO.setId(UUIDUtils.randomUUID20()); - personCollectEO.setUserId(userId); - personCollectEO.setValidFlag(0); - personCollectEO.setCreationTime(new Date()); - personCollectEO.setModifyTime(new Date()); - personCollectEOService.save(personCollectEO); - return Result.success("0","收藏成功,请到'我的收藏'中查看相关信息。",personCollectEO); + public ResponseMessage create(@RequestBody TsPersonCollect tsPersonCollect) throws Exception { + // String userId = LoginUserUtil.getUserId(); + + tsPersonCollect.setId(UUIDUtils.randomUUID20()); + tsPersonCollect.setValidFlag(0); + tsPersonCollect.setCreationTime(new Date()); + tsPersonCollect.setModifyTime(new Date()); + + + personCollectEOService.save(tsPersonCollect); + + return Result.success("0","收藏成功,请到'我的收藏'中查看相关信息。", tsPersonCollect); } @ApiOperation(value = "|PersonCollectEO|修改") @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) // @RequiresPermissions("person:personCollect:update") - public ResponseMessage update(@RequestBody PersonCollectEO personCollectEO) throws Exception { - personCollectEO.setModifyTime(new Date()); - personCollectEOService.updateById(personCollectEO); - return Result.success(personCollectEO); + public ResponseMessage update(@RequestBody TsPersonCollect tsPersonCollect) throws Exception { + tsPersonCollect.setModifyTime(new Date()); + personCollectEOService.updateById(tsPersonCollect); + return Result.success(tsPersonCollect); } @@ -155,16 +122,23 @@ public class PersonCollectEOController extends BaseController { * @Param [personCollectEO] * @return com.adc.da.util.http.ResponseMessage **/ + + /** + * 通过收藏的id和userId确定修改的数据 + * @param tsPersonCollect + * @return + * @throws Exception + */ @ApiOperation(value = "取消收藏") @PutMapping("/updateByUserId") // @RequiresPermissions("person:personCollect:updateByUserId") PersonCollectEO - public ResponseMessage updateByUserId(PersonCollectEO personCollectEO) throws Exception { - personCollectEO.setValidFlag(1); - int result = personCollectEOService.updateByPrimaryKeySelective(personCollectEO); + public ResponseMessage updateByUserId(TsPersonCollect tsPersonCollect) throws Exception { + tsPersonCollect.setValidFlag(1); + int result = personCollectEOService.updateByPrimaryKeySelective(tsPersonCollect); if(result == 1){ - return Result.success("0","取消成功",personCollectEO); + return Result.success("0","取消成功", tsPersonCollect); } else { - return Result.error("0","取消失败",personCollectEO); + return Result.error("0","取消失败", tsPersonCollect); } } diff --git a/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java index 26c07001..59ddd12e 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java @@ -1,7 +1,7 @@ package com.adc.da.person.dao; import com.adc.da.base.page.BasePage; -import com.adc.da.person.entity.PersonCollectEO; +import com.adc.da.person.entity.TsPersonCollect; import com.adc.da.person.page.PersonCollectEOPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -16,15 +16,15 @@ import java.util.List; * 日期： 2018-09-03
* 版权所有：版权归北京卡达克数据技术中心所有。
*/ -public interface PersonCollectEODao extends BaseMapper { +public interface PersonCollectEODao extends BaseMapper { - public List queryByList(BasePage page); + public List queryByList(BasePage page); public int queryByCount(BasePage var1); - public List queryByPage(BasePage page); + public List queryByPage(BasePage page); - public List queryByPersonCollectPage(PersonCollectEOPage page); + public List queryByPersonCollectPage(PersonCollectEOPage page); public int queryByPersonCollectPageCount(PersonCollectEOPage page); @@ -34,6 +34,6 @@ public interface PersonCollectEODao extends BaseMapper { int deleteByResIdList(@Param("idList") List idList); - int updateByPrimaryKeySelective(PersonCollectEO personCollectEO); + int updateByPrimaryKeySelective(TsPersonCollect tsPersonCollect); } diff --git a/adc-da-sys/src/main/java/com/adc/da/person/entity/PersonCollectEO.java b/adc-da-sys/src/main/java/com/adc/da/person/entity/TsPersonCollect.java similarity index 94% rename from adc-da-sys/src/main/java/com/adc/da/person/entity/PersonCollectEO.java rename to adc-da-sys/src/main/java/com/adc/da/person/entity/TsPersonCollect.java index c7200d51..8a62e5c2 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/entity/PersonCollectEO.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/entity/TsPersonCollect.java @@ -1,6 +1,9 @@ package com.adc.da.person.entity; import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.ArrayList; @@ -13,24 +16,32 @@ import java.util.List; * 日期： 2018-09-03
* 版权所有：版权归北京卡达克数据技术中心所有。
*/ -public class PersonCollectEO extends BaseEntity { - +public class TsPersonCollect extends BaseEntity { + @TableField //@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date modifyTime; //@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - + @TableField private Date creationTime; + @TableLogic private Integer validFlag; + @TableField private String collectResId; + @TableField private String collectInfoUri; + @TableField private String collectTitle; + @TableField private String collectType; + @TableField private String userId; + @TableId private String id; //追加字段 + @TableField(exist = false) private List noteList = new ArrayList<>(); @@ -94,7 +105,7 @@ public class PersonCollectEO extends BaseEntity { default: return null; } } - + /** **/ public Date getModifyTime() { return this.modifyTime; diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java index e275d28a..b21e938f 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java @@ -1,18 +1,20 @@ package com.adc.da.person.service; -import com.adc.da.person.entity.PersonCollectEO; +import com.adc.da.http.ResponseMessage; +import com.adc.da.person.entity.TsPersonCollect; import com.adc.da.person.page.PersonCollectEOPage; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; -public interface IPersonCollectEOService extends IService { +public interface IPersonCollectEOService extends IService { - public List queryByPage(PersonCollectEOPage page); + public List queryByPage(PersonCollectEOPage page); - public List queryByList(PersonCollectEOPage page); + public List queryByList(PersonCollectEOPage page); - public List queryByPersonCollectPage(PersonCollectEOPage page); + public List queryByPersonCollectPage(PersonCollectEOPage page); public String queryCollectByUserAndId(String collectResId); @@ -20,6 +22,8 @@ public interface IPersonCollectEOService extends IService { public int deleteByResId(String resId); - int updateByPrimaryKeySelective(PersonCollectEO personCollectEO) throws Exception; + int updateByPrimaryKeySelective(TsPersonCollect tsPersonCollect) throws Exception; + + public ResponseMessage> queryCollectByWrapper(Integer pageNo, Integer pageSize, String modeType, String collectTitle); } diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java index 9035db87..fc781203 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java @@ -1,14 +1,18 @@ package com.adc.da.person.service.impl; import com.adc.da.base.page.BasePage; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; import com.adc.da.person.dao.PersonCollectEODao; -import com.adc.da.person.dao.PersonConfEODao; import com.adc.da.person.dao.PersonNoteEODao; -import com.adc.da.person.entity.PersonCollectEO; +import com.adc.da.person.entity.TsPersonCollect; import com.adc.da.person.entity.PersonNoteEO; import com.adc.da.person.page.PersonCollectEOPage; import com.adc.da.person.service.IPersonCollectEOService; import com.adc.da.util.LoginUserUtil; +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; @@ -28,7 +32,7 @@ import java.util.List; */ @Service("personCollectEOService") @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) -public class PersonCollectEOServiceImpl extends ServiceImpl implements IPersonCollectEOService { +public class PersonCollectEOServiceImpl extends ServiceImpl implements IPersonCollectEOService { @@ -38,8 +42,9 @@ public class PersonCollectEOServiceImpl extends ServiceImpl queryByPage(PersonCollectEOPage page) { + public List queryByPage(PersonCollectEOPage page) { Integer rowCount = this.queryByCount(page); page.getPager().setRowCount(rowCount); return this.baseMapper.queryByPage(page); @@ -50,15 +55,15 @@ public class PersonCollectEOServiceImpl extends ServiceImpl queryByList(PersonCollectEOPage page) { + public List queryByList(PersonCollectEOPage page) { return this.baseMapper.queryByList(page); } - public List queryByPersonCollectPage(PersonCollectEOPage page){ + public List queryByPersonCollectPage(PersonCollectEOPage page){ page.setValidFlag("0"); int ire = this.baseMapper.queryByPersonCollectPageCount(page); page.getPager().setRowCount(ire); - List list = this.baseMapper.queryByPersonCollectPage(page); + List list = this.baseMapper.queryByPersonCollectPage(page); for(int i =0;i getCollects = this.baseMapper.queryByList(page); + List getCollects = this.baseMapper.queryByList(page); String collectId = ""; if(getCollects != null){ if(getCollects.size()>0){ @@ -101,7 +106,35 @@ public class PersonCollectEOServiceImpl extends ServiceImpl> queryCollectByWrapper(Integer pageNo, Integer pageSize, String collectTitle, String userId) { + BasePage basePage = new BasePage(); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("user_id",userId); + if (collectTitle != null && !collectTitle.equals("")){ + wrapper.like("collect_title",collectTitle); + + } + + if (pageNo != null) { + basePage.setPage(pageNo); + }else{ + basePage.setPage(1); + } + if (pageSize != null) { + basePage.setPageSize(pageSize); + }else{ + basePage.setPageSize(10); + } + + + IPage page = this.page(new Page<>(basePage.getPage(), basePage.getPageSize()), wrapper); + return Result.success(page); + } + } diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml index 68378140..230c587c 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml @@ -2,7 +2,7 @@ - + @@ -153,7 +153,7 @@ - + @@ -164,7 +164,7 @@ - + @@ -194,7 +194,7 @@ - + update TS_PERSON_COLLECT set modify_time = #{modifyTime}, creation_time = #{creationTime}, @@ -208,7 +208,7 @@ - + update TS_PERSON_COLLECT @@ -332,7 +332,7 @@ ${pager.orderCondition} order by TS_PERSON_COLLECT.creation_time desc - ) tmp_tb where rownum <= ${pager.endIndex}) + ) as tmp_tb where rownum <= ${pager.endIndex}) where rn >= ${pager.startIndex} @@ -391,4 +391,10 @@ + +