diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java index a4771a6bf..2d4dae9df 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java @@ -1,7 +1,6 @@ package com.jero.modules.cert.template.controller; import cn.hutool.core.collection.CollectionUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,6 +9,7 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.cert.template.entity.ParamsInfoEO; import com.jero.modules.cert.template.service.IParamsInfoEOService; +import com.jero.modules.cert.template.service.IParamsInfoPublishEOService; import com.jero.modules.cert.template.vo.ParamsInfoVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.List; +import java.util.Map; /** @@ -39,6 +40,9 @@ import java.util.List; public class ParamsInfoEOController extends JeroController { @Autowired private IParamsInfoEOService paramsInfoEOService; + + @Autowired + private IParamsInfoPublishEOService paramsInfoPublishEOService; /** * 分页列表查询 @@ -55,6 +59,8 @@ public class ParamsInfoEOController extends JeroController queryPageList(ParamsInfoEO paramsInfoEO, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="orderByField", required = false) String orderByField, + @RequestParam(name="orderBy", required = false) String orderBy, @RequestParam(name="cut") String cut, HttpServletRequest req) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -62,6 +68,7 @@ public class ParamsInfoEOController extends JeroController page = new Page(pageNo, pageSize); IPage pageList = paramsInfoEOService.page(page, queryWrapper); @@ -112,8 +119,12 @@ public class ParamsInfoEOController extends JeroController add(@Validated @RequestBody ParamsInfoEO paramsInfoEO) { - paramsInfoEOService.add(paramsInfoEO); - return Result.OK("添加成功！"); + boolean isSuccess = paramsInfoEOService.add(paramsInfoEO); + if (isSuccess) { + return Result.OK("添加成功！"); + } else { + return Result.error("添加失败！"); + } } /** @@ -126,8 +137,12 @@ public class ParamsInfoEOController extends JeroController edit(@Validated @RequestBody ParamsInfoEO paramsInfoEO) { - paramsInfoEOService.editById(paramsInfoEO); - return Result.OK("编辑成功!"); + boolean isSuccess = paramsInfoEOService.editById(paramsInfoEO); + if (isSuccess) { + return Result.OK("编辑成功!"); + } else { + return Result.error("编辑失败!"); + } } /** @@ -181,6 +196,20 @@ public class ParamsInfoEOController extends JeroController publish(@RequestParam(name="paramsTemplateId") String paramsTemplateId) { + int publishVersion = paramsInfoPublishEOService.publishTemplate(paramsTemplateId); + return Result.OK("发布版本：" + publishVersion + "成功!"); + } + @AutoLog(value = "参数项基本信息表-模板下载") @ApiOperation(value = "参数项基本信息表-模板下载", notes="参数项基本信息表-模板下载") @GetMapping(value = "/exportTemplate") @@ -195,20 +224,16 @@ public class ParamsInfoEOController extends JeroController map, + HttpServletResponse response, + HttpServletRequest request) { + String cut = (String) map.get("cut"); + String exportName = (String) map.get("exportName"); + ParamsInfoVO paramsInfoVO = (ParamsInfoVO) map.get("paramsInfoVO"); paramsInfoEOService.exportParamsInfo(cut, paramsInfoVO, exportName, response, request); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java index 4020eb4fe..866ddb79a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java @@ -3,11 +3,11 @@ package com.jero.modules.cert.template.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.modules.cert.template.entity.ParamsTemplateEO; -import com.jero.modules.cert.template.service.IParamsTemplateEOService; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.cert.template.entity.ParamsTemplateEO; +import com.jero.modules.cert.template.service.IParamsTemplateEOService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -156,7 +156,23 @@ public class ParamsTemplateEOController extends JeroController copyById(@RequestParam(name="id") String id, + @RequestParam(name="paramsTemplateName") String paramsTemplateName) { + ParamsTemplateEO paramsTemplateEO = paramsTemplateEOService.copyById(id, paramsTemplateName); + return Result.OK("复制成功", paramsTemplateEO); + } + + + /** * 导出excel * * @param request diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoPublishEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoPublishEO.java new file mode 100644 index 000000000..b3cf1ecff --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoPublishEO.java @@ -0,0 +1,36 @@ +package com.jero.modules.cert.template.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +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.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; + + +/** + * @Description: 认证类别参数信息表发布版 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +@Data +@TableName("cert_category_params_info_publish") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="cert_category_params_info_publish对象", description="认证类别参数信息表发布版") +public class CertCategoryParamsInfoPublishEO extends CertCategoryParamsInfoEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**发布时版本*/ + @ApiModelProperty(value = "发布时版本") + private Integer version; + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoPublishEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoPublishEO.java new file mode 100644 index 000000000..2f93dd0e7 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoPublishEO.java @@ -0,0 +1,31 @@ +package com.jero.modules.cert.template.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + + +/** + * @Description: 参数项基本信息表发布版 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +@Data +@TableName("params_info_publish") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="params_info_publish对象", description="参数项基本信息表发布版") +public class ParamsInfoPublishEO extends ParamsInfoEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**发布时版本*/ + @ApiModelProperty(value = "发布时版本") + private Integer version; + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoEOMapper.java index 45fb117d7..397c83626 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoEOMapper.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoEOMapper.java @@ -21,5 +21,9 @@ public interface CertCategoryParamsInfoEOMapper extends BaseMapper selectListByNioNumber(@Param("nioNumber") String nioNumber); + List selectListByParamsTemplateIds(@Param("paramsTemplateIds") String paramsTemplateIds); + int deleteByNioNumberList(@Param("list") List nioNumberList); + + int deleteByParamsTemplateIds(@Param("paramsTemplateIds") String paramsTemplateIds); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoPublishEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoPublishEOMapper.java new file mode 100644 index 000000000..aa7ae0aaa --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/CertCategoryParamsInfoPublishEOMapper.java @@ -0,0 +1,14 @@ +package com.jero.modules.cert.template.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.cert.template.entity.CertCategoryParamsInfoPublishEO; + +/** + * @Description: 认证类别参数信息表发布版 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +public interface CertCategoryParamsInfoPublishEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java index 586d63afa..70c378fc1 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoEOMapper.java @@ -17,6 +17,11 @@ import java.util.List; public interface ParamsInfoEOMapper extends BaseMapper { List selectListWithCert(@Param("paramsInfoVO") ParamsInfoVO paramsInfoVO); - + List selectListWithCertForEnExport(@Param("paramsInfoVO") ParamsInfoVO paramsInfoVO); + + int deleteByParamsTemplateIds(@Param("paramsTemplateIds") String paramsTemplateIds); + + List selectListByParamsTemplateIds(@Param("paramsTemplateIds") String paramsTemplateIds); + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoPublishEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoPublishEOMapper.java new file mode 100644 index 000000000..f6c577f8d --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/ParamsInfoPublishEOMapper.java @@ -0,0 +1,14 @@ +package com.jero.modules.cert.template.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.cert.template.entity.ParamsInfoPublishEO; + +/** + * @Description: 参数项基本信息表发布版 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +public interface ParamsInfoPublishEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoEOMapper.xml index 8a054a983..6c71449cc 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoEOMapper.xml @@ -25,6 +25,15 @@ + + delete from cert_category_params_info where nio_number in @@ -32,4 +41,12 @@ #{nioNumber} + + + delete from cert_category_params_info + where params_template_id in + + #{item} + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoPublishEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoPublishEOMapper.xml new file mode 100644 index 000000000..27710f449 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoPublishEOMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml index 3867e87ed..b9bfc343b 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml @@ -117,6 +117,9 @@ + + AND params_template_id LIKE CONCAT(CONCAT('%',#{paramsInfoVO.paramsTemplateId}),'%') + AND nio_number LIKE CONCAT(CONCAT('%',#{paramsInfoVO.nioNumber}),'%') @@ -153,4 +156,21 @@ + + + + delete from params_info + where params_template_id in + + #{item} + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoPublishEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoPublishEOMapper.xml new file mode 100644 index 000000000..5970251fc --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoPublishEOMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoEOService.java index 7421eaee0..93d2eed83 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoEOService.java @@ -2,6 +2,8 @@ package com.jero.modules.cert.template.service; import com.jero.modules.cert.template.entity.CertCategoryParamsInfoEO; import com.baomidou.mybatisplus.extension.service.IService; +import org.apache.ibatis.annotations.Param; + import java.util.List; /** @@ -61,5 +63,9 @@ public interface ICertCategoryParamsInfoEOService extends IService selectListByNioNumber(String nioNumber); + List selectListByParamsTemplateIds(String paramsTemplateIds); + int deleteByNioNumberList(List nioNumberList); + + int deleteByParamsTemplateIds(String paramsTemplateIds); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoPublishEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoPublishEOService.java new file mode 100644 index 000000000..5c4bff3c9 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoPublishEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.cert.template.service; + +import com.jero.modules.cert.template.entity.CertCategoryParamsInfoPublishEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 认证类别参数信息表发布版 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +public interface ICertCategoryParamsInfoPublishEOService extends IService { + + /** + * 保存 + * + * @param certCategoryParamsInfoPublishEO + * @return + */ + void add(CertCategoryParamsInfoPublishEO certCategoryParamsInfoPublishEO); + + /** + * 更新 + * + * @param certCategoryParamsInfoPublishEO + * @return + */ + void editById(CertCategoryParamsInfoPublishEO certCategoryParamsInfoPublishEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + CertCategoryParamsInfoPublishEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java index d6dbb107c..625d14cf1 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java @@ -28,7 +28,7 @@ public interface IParamsInfoEOService extends IService { * @param paramsInfoEO * @return */ - void add(ParamsInfoEO paramsInfoEO); + boolean add(ParamsInfoEO paramsInfoEO); /** * 更新 @@ -36,7 +36,7 @@ public interface IParamsInfoEOService extends IService { * @param paramsInfoEO * @return */ - void editById(ParamsInfoEO paramsInfoEO); + boolean editById(ParamsInfoEO paramsInfoEO); /** * 通过id删除 @@ -96,4 +96,9 @@ public interface IParamsInfoEOService extends IService { String unzipfilepath, String paramsTemplateId, String cut); + + + int deleteByParamsTemplateIds(String paramsTemplateIds); + + List selectListByParamsTemplateIds(String paramsTemplateIds); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoPublishEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoPublishEOService.java new file mode 100644 index 000000000..d326581c9 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoPublishEOService.java @@ -0,0 +1,64 @@ +package com.jero.modules.cert.template.service; + +import com.jero.modules.cert.template.entity.ParamsInfoPublishEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 参数项基本信息表发布版 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +public interface IParamsInfoPublishEOService extends IService { + + /** + * 保存 + * + * @param paramsInfoPublishEO + * @return + */ + void add(ParamsInfoPublishEO paramsInfoPublishEO); + + /** + * 更新 + * + * @param paramsInfoPublishEO + * @return + */ + void editById(ParamsInfoPublishEO paramsInfoPublishEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ParamsInfoPublishEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); + + int publishTemplate(String paramsTemplateId); + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsTemplateEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsTemplateEOService.java index 477c465b3..a6d22f9cd 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsTemplateEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsTemplateEOService.java @@ -53,6 +53,8 @@ public interface IParamsTemplateEOService extends IService { */ ParamsTemplateEO queryById(String id); + ParamsTemplateEO copyById(String id, String paramsTemplateName); + /** * 列表查询 * diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java index e7729a896..0ca3caeda 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java @@ -93,8 +93,18 @@ public class CertCategoryParamsInfoEOServiceImpl extends ServiceImpl selectListByParamsTemplateIds(String paramsTemplateIds) { + return baseMapper.selectListByParamsTemplateIds(paramsTemplateIds); + } + @Override public int deleteByNioNumberList(List nioNumberList) { return baseMapper.deleteByNioNumberList(nioNumberList); } + + @Override + public int deleteByParamsTemplateIds(String paramsTemplateIds) { + return baseMapper.deleteByParamsTemplateIds(paramsTemplateIds); + } } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoPublishEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoPublishEOServiceImpl.java new file mode 100644 index 000000000..8dcecaf2c --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoPublishEOServiceImpl.java @@ -0,0 +1,90 @@ +package com.jero.modules.cert.template.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.cert.template.entity.CertCategoryParamsInfoPublishEO; +import com.jero.modules.cert.template.mapper.CertCategoryParamsInfoPublishEOMapper; +import com.jero.modules.cert.template.service.ICertCategoryParamsInfoPublishEOService; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + * @Description: 认证类别参数信息表发布版 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +@Service +public class CertCategoryParamsInfoPublishEOServiceImpl extends ServiceImpl implements ICertCategoryParamsInfoPublishEOService { + + /** + * 保存 + * + * @param certCategoryParamsInfoPublishEO + * @return + */ + @Override + public void add(CertCategoryParamsInfoPublishEO certCategoryParamsInfoPublishEO) { + Date now = new Date(); + certCategoryParamsInfoPublishEO.setCreateTime(now); + certCategoryParamsInfoPublishEO.setUpdateTime(now); + save(certCategoryParamsInfoPublishEO); + } + + /** + * 更新 + * + * @param certCategoryParamsInfoPublishEO + * @return + */ + @Override + public void editById(CertCategoryParamsInfoPublishEO certCategoryParamsInfoPublishEO) { + Date now = new Date(); + certCategoryParamsInfoPublishEO.setUpdateTime(now); + saveOrUpdate(certCategoryParamsInfoPublishEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public CertCategoryParamsInfoPublishEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index 6167f4cfc..7869fc4b8 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -1,7 +1,7 @@ package com.jero.modules.cert.template.service.impl; -import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.afterturn.easypoi.excel.ExcelImportUtil; +import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; @@ -36,8 +36,8 @@ import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.ExcelExportUtil; +import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.enmus.ExcelType; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -68,6 +68,7 @@ import static com.jero.modules.split.util.ExcelUtil.checkObjAllFieldsIsNull; @Service @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class ParamsInfoEOServiceImpl extends ServiceImpl implements IParamsInfoEOService { + @Autowired private ICertCategoryParamsInfoEOService certCategoryParamsInfoEOService; @@ -81,6 +82,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl { - certCategoryParamsInfoEO.setParamsTemplateId(paramsInfoId); + certCategoryParamsInfoEO.setParamsTemplateId(paramsTemplateId); certCategoryParamsInfoEO.setNioNumber(nioNumber); }); certCategoryParamsInfoEOService.saveBatch(certCategoryParamsInfoEOList); @@ -130,11 +132,11 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl { - certCategoryParamsInfoEO.setParamsTemplateId(paramsInfoId); + certCategoryParamsInfoEO.setParamsTemplateId(paramsTemplateId); certCategoryParamsInfoEO.setNioNumber(nioNumber); }); certCategoryParamsInfoEOService.saveBatch(certCategoryParamsInfoEOList); } Date now = new Date(); paramsInfoEO.setUpdateTime(now); - updateById(paramsInfoEO); + return updateById(paramsInfoEO); } /** @@ -808,6 +811,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl stringMessage = new ArrayList<>(); - int i = 2; //记录行号 + int i = 1; //记录行号 int num = 0; //记录是第几条数据 //循环验证数据 for (ParamsInfoCnImport dto : paramsInfoEOList) { @@ -895,9 +899,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl resultMap = new HashMap<>(); // nio编号 String nioNumber = dto.getNioNumber(); - validateMustAndLength(nioNumber, "nio编号", IsMustEnum.YES.getValue(),"15", errorMsg, countError, false, cut); + resultMap = validateMustAndLength(nioNumber, "nio编号", IsMustEnum.YES.getValue(),"15", false, cut); + errorMsg += (String)resultMap.get("errorMsg"); + countError += (int)resultMap.get("countError"); if (StringUtils.isNotEmpty(dto.getNioNumber())) { // 校验nio编号 格式：字母数字横杠（-） String nioNumberRegex = "^[A-Za-z0-9-]+$"; @@ -909,56 +916,97 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl> ccDtoMap : certCategoryParamsInfoEOListMap.entrySet()) { String certCategory = ccDtoMap.getKey(); List ccDtoList = ccDtoMap.getValue(); + int j = 1; for (CertCategoryParamsInfoCnImport ccDto : ccDtoList) { //判断此行数据是否全部为空,是则不读取 if (checkObjAllFieldsIsNull(ccDto)) { continue; } - i++; + j++; int countError = 0; //记录失败数据数量 String errorMsg = ""; if (CutEnum.CN.getValue().equals(cut)) { - errorMsg = certCategory + " 第" + i + "行："; + errorMsg = certCategory + " 第" + j + "行："; } else { - errorMsg = i + " line："; + errorMsg = j + " line："; } + Map resultMap = new HashMap<>(); // nio编号 String nioNumber = ccDto.getNioNumber(); - validateMustAndLength(nioNumber, "nio编号", IsMustEnum.YES.getValue(),"15", errorMsg, countError, false, cut); + resultMap = validateMustAndLength(nioNumber, "nio编号", IsMustEnum.YES.getValue(),"15", false, cut); + errorMsg += (String)resultMap.get("errorMsg"); + countError += (int)resultMap.get("countError"); if (StringUtils.isNotEmpty(ccDto.getNioNumber())) { // 校验nio编号 格式：字母数字横杠（-） String nioNumberRegex = "^[A-Za-z0-9-]+$"; @@ -1032,13 +1084,19 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl 0) { stringMessage.add(errorMsg); @@ -1072,8 +1130,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl validateMustAndLength (String value, String fieldName, String mustInput, String dbLength, Boolean isSingle, String cut) { + String errorMsg = ""; + int countError= 0; + Map resultMap = new HashMap<>(); + + if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isEmpty(value)) { if(CutEnum.CN.getValue().equals(cut)) { errorMsg += fieldName + "为必填项,不能为空；"; } else { @@ -1082,7 +1144,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { + if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) { if(CutEnum.CN.getValue().equals(cut)) { errorMsg += fieldName + "不能超过" + dbLength + "个字符；"; } else { @@ -1093,7 +1155,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl getCodeByName(String value, String fieldName, String type, Map enumMap, List judgeData, List coverData,String cut) { + String errorMsg = ""; + int countError= 0; + Map resultMap = new HashMap<>(); + if ("treeDicCode".equals(type)) { // 树形字典类型 List treeNameList = judgeData; @@ -1220,6 +1289,10 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl selectListByParamsTemplateIds(String paramsTemplateIds) { + return baseMapper.selectListByParamsTemplateIds(paramsTemplateIds); + } } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java new file mode 100644 index 000000000..6d96f17c8 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java @@ -0,0 +1,155 @@ +package com.jero.modules.cert.template.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.system.vo.LoginUser; +import com.jero.modules.cert.template.entity.*; +import com.jero.modules.cert.template.mapper.ParamsInfoPublishEOMapper; +import com.jero.modules.cert.template.service.*; +import org.apache.shiro.SecurityUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.UUID; + +/** + * @Description: 参数项基本信息表发布版 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +@Service +public class ParamsInfoPublishEOServiceImpl extends ServiceImpl implements IParamsInfoPublishEOService { + + @Autowired + private IParamsTemplateEOService paramsTemplateEOService; + @Autowired + private IParamsInfoEOService paramsInfoEOService; + @Autowired + private ICertCategoryParamsInfoEOService certCategoryParamsInfoEOService; + @Autowired + private ICertCategoryParamsInfoPublishEOService certCategoryParamsInfoPublishEOService; + + /** + * 保存 + * + * @param paramsInfoPublishEO + * @return + */ + @Override + public void add(ParamsInfoPublishEO paramsInfoPublishEO) { + Date now = new Date(); + paramsInfoPublishEO.setCreateTime(now); + paramsInfoPublishEO.setUpdateTime(now); + save(paramsInfoPublishEO); + } + + /** + * 更新 + * + * @param paramsInfoPublishEO + * @return + */ + @Override + public void editById(ParamsInfoPublishEO paramsInfoPublishEO) { + Date now = new Date(); + paramsInfoPublishEO.setUpdateTime(now); + saveOrUpdate(paramsInfoPublishEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ParamsInfoPublishEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } + + + @Override + public int publishTemplate(String paramsTemplateId) { + ParamsTemplateEO source = paramsTemplateEOService.queryById(paramsTemplateId); + List sourceParamsInfoEOList = paramsInfoEOService.selectListByParamsTemplateIds(paramsTemplateId); + List sourceCertCategoryParamsInfoEOList = certCategoryParamsInfoEOService.selectListByParamsTemplateIds(paramsTemplateId); + + List targetParamsInfoPublishEOList = new ArrayList<>(); + List targetCertCategoryParamsInfoPublishEOList = new ArrayList<>(); + + int newVersion = source.getVersion() + 1; + ParamsTemplateEO updateSource = new ParamsTemplateEO(); + updateSource.setId(paramsTemplateId); + updateSource.setVersion(newVersion); + + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + for (ParamsInfoEO sourceParamsInfoEO : sourceParamsInfoEOList) { + ParamsInfoPublishEO targetParamsInfoEO = new ParamsInfoPublishEO(); + BeanUtils.copyProperties(sourceParamsInfoEO, targetParamsInfoEO); + targetParamsInfoEO.setParamsTemplateId(paramsTemplateId); + targetParamsInfoEO.setId(UUID.randomUUID().toString().replace("-","")); + targetParamsInfoEO.setVersion(newVersion); // 设置发布版本 + targetParamsInfoEO.setCreateTime(new Date()); + targetParamsInfoEO.setCreateBy(sysUser.getUsername()); + targetParamsInfoEO.setUpdateTime(new Date()); + targetParamsInfoEO.setUpdateBy(sysUser.getUsername()); + targetParamsInfoPublishEOList.add(targetParamsInfoEO); + } + + for (CertCategoryParamsInfoEO sourceCertCategoryParamsInfoEO : sourceCertCategoryParamsInfoEOList) { + CertCategoryParamsInfoPublishEO targetCertCategoryParamsInfoEO = new CertCategoryParamsInfoPublishEO(); + BeanUtils.copyProperties(sourceCertCategoryParamsInfoEO, targetCertCategoryParamsInfoEO); + targetCertCategoryParamsInfoEO.setParamsTemplateId(paramsTemplateId); + targetCertCategoryParamsInfoEO.setVersion(newVersion); // 设置发布版本 + targetCertCategoryParamsInfoEO.setId(null); + targetCertCategoryParamsInfoEO.setCreateTime(new Date()); + targetCertCategoryParamsInfoEO.setCreateBy(sysUser.getUsername()); + targetCertCategoryParamsInfoEO.setUpdateTime(new Date()); + targetCertCategoryParamsInfoEO.setUpdateBy(sysUser.getUsername()); + targetCertCategoryParamsInfoPublishEOList.add(targetCertCategoryParamsInfoEO); + } + + this.saveBatch(targetParamsInfoPublishEOList); + certCategoryParamsInfoPublishEOService.saveBatch(targetCertCategoryParamsInfoPublishEOList); + paramsTemplateEOService.updateById(updateSource); + + return newVersion; + } +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java index 44728a7d7..3e1f82255 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java @@ -1,13 +1,24 @@ package com.jero.modules.cert.template.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.system.vo.LoginUser; +import com.jero.modules.cert.template.entity.CertCategoryParamsInfoEO; +import com.jero.modules.cert.template.entity.ParamsInfoEO; import com.jero.modules.cert.template.entity.ParamsTemplateEO; import com.jero.modules.cert.template.mapper.ParamsTemplateEOMapper; +import com.jero.modules.cert.template.service.ICertCategoryParamsInfoEOService; +import com.jero.modules.cert.template.service.IParamsInfoEOService; import com.jero.modules.cert.template.service.IParamsTemplateEOService; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.UUID; /** * @Description: 参数模板表 @@ -18,6 +29,12 @@ import java.util.List; @Service public class ParamsTemplateEOServiceImpl extends ServiceImpl implements IParamsTemplateEOService { + @Autowired + private IParamsInfoEOService paramsInfoEOService; + + @Autowired + private ICertCategoryParamsInfoEOService certCategoryParamsInfoEOService; + /** * 保存 * @@ -26,6 +43,7 @@ public class ParamsTemplateEOServiceImpl extends ServiceImpl ids) { - // TODO 关联删除参数项 + // 关联删除参数项 + certCategoryParamsInfoEOService.deleteByParamsTemplateIds(StringUtils.join(ids, ",")); + paramsInfoEOService.deleteByParamsTemplateIds(StringUtils.join(ids, ",")); removeByIds(ids); } @@ -83,7 +105,66 @@ public class ParamsTemplateEOServiceImpl extends ServiceImpl sourceParamsInfoEOList = paramsInfoEOService.selectListByParamsTemplateIds(id); + List sourceCertCategoryParamsInfoEOList = certCategoryParamsInfoEOService.selectListByParamsTemplateIds(id); + + ParamsTemplateEO target = new ParamsTemplateEO(); + List targetParamsInfoEOList = new ArrayList<>(); + List targetCertCategoryParamsInfoEOList = new ArrayList<>(); + + BeanUtils.copyProperties(source, target); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String paramsTemplateId = UUID.randomUUID().toString().replace("-",""); + + target.setId(paramsTemplateId); + target.setParamsTemplateName(paramsTemplateName); + target.setVersion(0); + target.setCreateTime(new Date()); + target.setCreateBy(sysUser.getUsername()); + target.setUpdateTime(new Date()); + target.setUpdateBy(sysUser.getUsername()); + + for (ParamsInfoEO sourceParamsInfoEO : sourceParamsInfoEOList) { + ParamsInfoEO targetParamsInfoEO = new ParamsInfoEO(); + BeanUtils.copyProperties(sourceParamsInfoEO, targetParamsInfoEO); + targetParamsInfoEO.setParamsTemplateId(paramsTemplateId); + targetParamsInfoEO.setId(UUID.randomUUID().toString().replace("-","")); + targetParamsInfoEO.setCreateTime(new Date()); + targetParamsInfoEO.setCreateBy(sysUser.getUsername()); + targetParamsInfoEO.setUpdateTime(new Date()); + targetParamsInfoEO.setUpdateBy(sysUser.getUsername()); + targetParamsInfoEOList.add(targetParamsInfoEO); + } + + for (CertCategoryParamsInfoEO sourceCertCategoryParamsInfoEO : sourceCertCategoryParamsInfoEOList) { + CertCategoryParamsInfoEO targetCertCategoryParamsInfoEO = new CertCategoryParamsInfoEO(); + BeanUtils.copyProperties(sourceCertCategoryParamsInfoEO, targetCertCategoryParamsInfoEO); + targetCertCategoryParamsInfoEO.setParamsTemplateId(paramsTemplateId); + targetCertCategoryParamsInfoEO.setId(null); + targetCertCategoryParamsInfoEO.setCreateTime(new Date()); + targetCertCategoryParamsInfoEO.setCreateBy(sysUser.getUsername()); + targetCertCategoryParamsInfoEO.setUpdateTime(new Date()); + targetCertCategoryParamsInfoEO.setUpdateBy(sysUser.getUsername()); + targetCertCategoryParamsInfoEOList.add(targetCertCategoryParamsInfoEO); + } + + paramsInfoEOService.saveBatch(targetParamsInfoEOList); + certCategoryParamsInfoEOService.saveBatch(targetCertCategoryParamsInfoEOList); + save(target); + + return target; + } + + /** * 列表查询 * * @return diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoCnImport.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoCnImport.java index f72d23fff..077406aad 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoCnImport.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoCnImport.java @@ -42,22 +42,22 @@ public class CertCategoryParamsInfoCnImport { private String sysOrgCode; /**编号*/ - @Excel(name = "*number", width = 15, orderNum = "2") + @Excel(name = "*编号", width = 15, orderNum = "2") @ApiModelProperty(value = "编号") private String paramsNumber; /**参数名称*/ - @Excel(name = "*params name", width = 15, orderNum = "3") + @Excel(name = "*参数名称", width = 15, orderNum = "3") @ApiModelProperty(value = "参数名称") private String paramsName; /**参数说明*/ - @Excel(name = "description", width = 36, orderNum = "4") + @Excel(name = "参数说明", width = 36, orderNum = "4") @ApiModelProperty(value = "参数说明") private String description; /**nio编号*/ - @Excel(name = "*nio number", width = 15, orderNum = "1") + @Excel(name = "*nio编号", width = 15, orderNum = "1") @ApiModelProperty(value = "nio编号") private String nioNumber; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoVO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoVO.java index 3cc7fbed5..ce00d832f 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoVO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoVO.java @@ -13,4 +13,5 @@ public class ParamsInfoVO { private String paramsName; // 参数名称 private String dutyTerritory; // 责任领域 private String ids; // 勾选的参数项id + private String paramsTemplateId; // 参数模板id } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index d9d268fae..25f53f5c9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -4267,6 +4267,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl wrapperTemp = new LambdaQueryWrapper<>(); - wrapperTemp.in(BussDocumentLibraryEO::getId,correspondingStandardSet); - List bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapperTemp); + List bussDocumentLibraryEOList = new ArrayList<>(); + if(correspondingStandardSet.size() != 0){ + //对应标准 iBussDocumentLibraryEOService + LambdaQueryWrapper wrapperTemp = new LambdaQueryWrapper<>(); + wrapperTemp.in(BussDocumentLibraryEO::getId,correspondingStandardSet); + bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapperTemp); + } + @@ -801,7 +805,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl categoryList = sysCategoryService.list(); //普通数据字典 List dictItemList = sysDictItemServiceImpl.selectItemsAll(); - importDatas(datas, categoryList, dictItemList, zipEntryName,saveDirectory,dummyInventoryInfoEO.getCut()); + importDatas(datas, categoryList, dictItemList, zipEntryName,saveDirectory,dummyInventoryInfoEO); //删除原上传文件 FileUnZip.deleteDir(saveDirectory); @@ -813,17 +817,17 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl dictItemList, String zipEntryName, File saveDirectory, - String cut) { + DummyInventoryInfoEO dummyInventoryInfoEOTemp) { int i = 3; List msgList = new ArrayList<>(); String value = ""; boolean flag = true; //编号验证 - List bussDocumentLibraryEOList = verifySerialNumber(dataList); + List bussDocumentLibraryEOList = verifySerialNumber(dataList,dummyInventoryInfoEOTemp); for (DummyInventoryInfoEO dummyInventoryInfoEO : dataList) { i++; String errorMsg = ""; - if(CutEnum.CN.getValue().equals(cut)){ + if(CutEnum.CN.getValue().equals(dummyInventoryInfoEOTemp.getCut())){ errorMsg = "第" + i + "行："; }else{ errorMsg = i + " line："; @@ -998,7 +1002,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl verifySerialNumber(List dataList) { + private List verifySerialNumber(List dataList,DummyInventoryInfoEO dummyInventoryInfoEOTemp) { //文档库数据 List serialNumberList = dataList.stream().map(DummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList()); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -1009,8 +1013,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl wrapperTemp = new LambdaQueryWrapper<>(); - wrapperTemp.in(DummyInventoryInfoEO::getSerialNumber,serialNumberList); + wrapperTemp.in(DummyInventoryInfoEO::getSerialNumber,serialNumberList).in(DummyInventoryInfoEO::getDummyInventoryBaseId,dummyInventoryInfoEOTemp.getDummyInventoryBaseId()); List dummyInventoryInfoEOList = this.list(wrapperTemp); + List serialNumberTempList = dummyInventoryInfoEOList.stream().map(DummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList()); if(serialNumberList.size() != serialNumberListTemp.size()){ //存在文档库没有的数据 List collect = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); @@ -1023,9 +1028,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl 0){ if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){ - throw new JeroBootException(StringUtils.join(serialNumberList,",")+"已存在,不能重复添加"); + throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+"已存在,不能重复添加"); }else{ - throw new JeroBootException(StringUtils.join(serialNumberList,",")+" already exists and cannot be added again"); + throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+" already exists and cannot be added again"); } } //通过编号将导入的数据与文档库进行关联 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCommentEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCommentEOController.java new file mode 100644 index 000000000..82b3dec8a --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCommentEOController.java @@ -0,0 +1,171 @@ +package com.jero.modules.project.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.project.entity.ProjectCommentEO; +import com.jero.modules.project.service.IProjectCommentEOService; +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.jero.modules.project.vo.ProjectCommentVO; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 法规清单评论表 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +@Api(tags="法规清单评论表") +@RestController +@RequestMapping("/project/projectCommentEO") +@Slf4j +public class ProjectCommentEOController extends JeroController { + @Autowired + private IProjectCommentEOService projectCommentEOService; + + /** + * 分页列表查询 + * + * @param projectCommentEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "法规清单评论表-分页列表查询") + @ApiOperation(value="法规清单评论表-分页列表查询", notes="法规清单评论表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProjectCommentEO projectCommentEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectCommentEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = projectCommentEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "法规清单评论表-列表查询") + @ApiOperation(value="法规清单评论表-列表查询", notes="法规清单评论表-列表查询") + @GetMapping(value = "/list") + public Result> queryList(ProjectCommentEO projectCommentEO) { + List list = projectCommentEOService.getInfoList(projectCommentEO); + return Result.OK(list); + } + + /** + * 添加 + * + * @param projectCommentEO + * @return + */ + @AutoLog(value = "法规清单评论表-添加") + @ApiOperation(value="法规清单评论表-添加", notes="法规清单评论表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProjectCommentEO projectCommentEO) { + projectCommentEOService.add(projectCommentEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param projectCommentEO + * @return + */ + @AutoLog(value = "法规清单评论表-编辑") + @ApiOperation(value="法规清单评论表-编辑", notes="法规清单评论表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProjectCommentEO projectCommentEO) { + projectCommentEOService.editById(projectCommentEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "法规清单评论表-通过id删除") + @ApiOperation(value="法规清单评论表-通过id删除", notes="法规清单评论表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + projectCommentEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "法规清单评论表-批量删除") + @ApiOperation(value="法规清单评论表-批量删除", notes="法规清单评论表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.projectCommentEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "法规清单评论表-通过id查询") + @ApiOperation(value="法规清单评论表-通过id查询", notes="法规清单评论表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProjectCommentEO projectCommentEO = projectCommentEOService.queryById(id); + if(projectCommentEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(projectCommentEO); + } + + /** + * 导出excel + * + * @param request + * @param projectCommentEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProjectCommentEO projectCommentEO) { + return super.exportXls(request, projectCommentEO, ProjectCommentEO.class, "法规清单评论表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProjectCommentEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectHistoryVersionsEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectHistoryVersionsEOController.java new file mode 100644 index 000000000..54e55065e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectHistoryVersionsEOController.java @@ -0,0 +1,175 @@ +package com.jero.modules.project.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.project.entity.ProjectHistoryVersionsEO; +import com.jero.modules.project.service.IProjectHistoryVersionsEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 法规清单历史版本表 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +@Api(tags="法规清单历史版本表") +@RestController +@RequestMapping("/project/projectHistoryVersionsEO") +@Slf4j +public class ProjectHistoryVersionsEOController extends JeroController { + @Autowired + private IProjectHistoryVersionsEOService projectHistoryVersionsEOService; + + /** + * 分页列表查询 + * + * @param projectHistoryVersionsEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "法规清单历史版本表-分页列表查询") + @ApiOperation(value="法规清单历史版本表-分页列表查询", notes="法规清单历史版本表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProjectHistoryVersionsEO projectHistoryVersionsEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectHistoryVersionsEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = projectHistoryVersionsEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "法规清单历史版本表-列表查询") + @ApiOperation(value="法规清单历史版本表-列表查询", notes="法规清单历史版本表-列表查询") + @GetMapping(value = "/list") + public Result> queryList(ProjectHistoryVersionsEO projectHistoryVersionsEO) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(ProjectHistoryVersionsEO::getProjectLibraryId,projectHistoryVersionsEO.getProjectLibraryId()); + wrapper.orderByDesc(ProjectHistoryVersionsEO::getCreateTime); + List list = projectHistoryVersionsEOService.list(wrapper); + return Result.OK(list); + } + + /** + * 添加 + * + * @param projectHistoryVersionsEO + * @return + */ + @AutoLog(value = "法规清单历史版本表-添加") + @ApiOperation(value="法规清单历史版本表-添加", notes="法规清单历史版本表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProjectHistoryVersionsEO projectHistoryVersionsEO) { + projectHistoryVersionsEOService.add(projectHistoryVersionsEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param projectHistoryVersionsEO + * @return + */ + @AutoLog(value = "法规清单历史版本表-编辑") + @ApiOperation(value="法规清单历史版本表-编辑", notes="法规清单历史版本表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProjectHistoryVersionsEO projectHistoryVersionsEO) { + projectHistoryVersionsEOService.editById(projectHistoryVersionsEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "法规清单历史版本表-通过id删除") + @ApiOperation(value="法规清单历史版本表-通过id删除", notes="法规清单历史版本表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + projectHistoryVersionsEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "法规清单历史版本表-批量删除") + @ApiOperation(value="法规清单历史版本表-批量删除", notes="法规清单历史版本表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.projectHistoryVersionsEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "法规清单历史版本表-通过id查询") + @ApiOperation(value="法规清单历史版本表-通过id查询", notes="法规清单历史版本表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProjectHistoryVersionsEO projectHistoryVersionsEO = projectHistoryVersionsEOService.queryById(id); + if(projectHistoryVersionsEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(projectHistoryVersionsEO); + } + + /** + * 导出excel + * + * @param request + * @param projectHistoryVersionsEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProjectHistoryVersionsEO projectHistoryVersionsEO) { + return super.exportXls(request, projectHistoryVersionsEO, ProjectHistoryVersionsEO.class, "法规清单历史版本表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProjectHistoryVersionsEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java index 4b343f21d..7b40dfa2a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java @@ -326,7 +326,7 @@ public class ProjectLawsInventoryEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryBaseEO, req.getParameterMap()); queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); - IPage pageList = dummyInventoryBaseEOService.getPageInfo(page,queryWrapper); + IPage pageList = dummyInventoryBaseEOService.getPageInfoDummy(page,queryWrapper); return Result.OK(dummyInventoryBaseEO.getCut(),pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectReplyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectReplyEOController.java new file mode 100644 index 000000000..d684bbaaf --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectReplyEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.project.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.project.entity.ProjectReplyEO; +import com.jero.modules.project.service.IProjectReplyEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 法规清单回复表 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +@Api(tags="法规清单回复表") +@RestController +@RequestMapping("/project/projectReplyEO") +@Slf4j +public class ProjectReplyEOController extends JeroController { + @Autowired + private IProjectReplyEOService projectReplyEOService; + + /** + * 分页列表查询 + * + * @param projectReplyEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "法规清单回复表-分页列表查询") + @ApiOperation(value="法规清单回复表-分页列表查询", notes="法规清单回复表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProjectReplyEO projectReplyEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectReplyEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = projectReplyEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "法规清单回复表-列表查询") + @ApiOperation(value="法规清单回复表-列表查询", notes="法规清单回复表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = projectReplyEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param projectReplyEO + * @return + */ + @AutoLog(value = "法规清单回复表-添加") + @ApiOperation(value="法规清单回复表-添加", notes="法规清单回复表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody ProjectReplyEO projectReplyEO) { + projectReplyEOService.add(projectReplyEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param projectReplyEO + * @return + */ + @AutoLog(value = "法规清单回复表-编辑") + @ApiOperation(value="法规清单回复表-编辑", notes="法规清单回复表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProjectReplyEO projectReplyEO) { + projectReplyEOService.editById(projectReplyEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "法规清单回复表-通过id删除") + @ApiOperation(value="法规清单回复表-通过id删除", notes="法规清单回复表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + projectReplyEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "法规清单回复表-批量删除") + @ApiOperation(value="法规清单回复表-批量删除", notes="法规清单回复表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.projectReplyEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "法规清单回复表-通过id查询") + @ApiOperation(value="法规清单回复表-通过id查询", notes="法规清单回复表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProjectReplyEO projectReplyEO = projectReplyEOService.queryById(id); + if(projectReplyEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(projectReplyEO); + } + + /** + * 导出excel + * + * @param request + * @param projectReplyEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProjectReplyEO projectReplyEO) { + return super.exportXls(request, projectReplyEO, ProjectReplyEO.class, "法规清单回复表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProjectReplyEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCommentEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCommentEO.java new file mode 100644 index 000000000..7eeaa313b --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCommentEO.java @@ -0,0 +1,74 @@ +package com.jero.modules.project.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 法规清单评论表 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +@Data +@TableName("project_comment") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="project_comment对象", description="法规清单评论表") +public class ProjectCommentEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**项目库id*/ + @Excel(name = "项目库id", width = 15) + @ApiModelProperty(value = "项目库id") + private java.lang.String projectLibraryId; + + /**评论内容*/ + @Excel(name = "评论内容", width = 15) + @ApiModelProperty(value = "评论内容") + private java.lang.String commentContent; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectHistoryVersionsEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectHistoryVersionsEO.java new file mode 100644 index 000000000..fd37d045a --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectHistoryVersionsEO.java @@ -0,0 +1,74 @@ +package com.jero.modules.project.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 法规清单历史版本表 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +@Data +@TableName("project_history_versions") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="project_history_versions对象", description="法规清单历史版本表") +public class ProjectHistoryVersionsEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**版本名称*/ + @Excel(name = "版本名称", width = 15) + @ApiModelProperty(value = "版本名称") + private java.lang.String versionsName; + + /**项目库id*/ + @Excel(name = "项目库id", width = 15) + @ApiModelProperty(value = "项目库id") + private java.lang.String projectLibraryId; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectReplyEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectReplyEO.java new file mode 100644 index 000000000..de20811f8 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectReplyEO.java @@ -0,0 +1,74 @@ +package com.jero.modules.project.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 法规清单回复表 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +@Data +@TableName("project_reply") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="project_reply对象", description="法规清单回复表") +public class ProjectReplyEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**法规清单评论表id*/ + @Excel(name = "法规清单评论表id", width = 15) + @ApiModelProperty(value = "法规清单评论表id") + private java.lang.String projectCommentId; + + /**回复内容*/ + @Excel(name = "回复内容", width = 15) + @ApiModelProperty(value = "回复内容") + private java.lang.String replyContent; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectCommentEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectCommentEOMapper.java new file mode 100644 index 000000000..dce5b1990 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectCommentEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.project.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.project.entity.ProjectCommentEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 法规清单评论表 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +public interface ProjectCommentEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectHistoryVersionsEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectHistoryVersionsEOMapper.java new file mode 100644 index 000000000..c65e94709 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectHistoryVersionsEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.project.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.project.entity.ProjectHistoryVersionsEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 法规清单历史版本表 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +public interface ProjectHistoryVersionsEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectReplyEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectReplyEOMapper.java new file mode 100644 index 000000000..7c966a82d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectReplyEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.project.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.project.entity.ProjectReplyEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 法规清单回复表 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +public interface ProjectReplyEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectCommentEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectCommentEOMapper.xml new file mode 100644 index 000000000..8cf42763e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectCommentEOMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectHistoryVersionsEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectHistoryVersionsEOMapper.xml new file mode 100644 index 000000000..f814efa8e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectHistoryVersionsEOMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectReplyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectReplyEOMapper.xml new file mode 100644 index 000000000..95be9d882 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectReplyEOMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCommentEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCommentEOService.java new file mode 100644 index 000000000..5f8f9ee25 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCommentEOService.java @@ -0,0 +1,66 @@ +package com.jero.modules.project.service; + +import com.jero.modules.project.entity.ProjectCommentEO; +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.project.vo.ProjectCommentVO; + +import java.util.List; + +/** + * @Description: 法规清单评论表 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +public interface IProjectCommentEOService extends IService { + + /** + * 保存 + * + * @param projectCommentEO + * @return + */ + void add(ProjectCommentEO projectCommentEO); + + /** + * 更新 + * + * @param projectCommentEO + * @return + */ + void editById(ProjectCommentEO projectCommentEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProjectCommentEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); + + + List getInfoList(ProjectCommentEO projectCommentEO); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectHistoryVersionsEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectHistoryVersionsEOService.java new file mode 100644 index 000000000..56c920513 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectHistoryVersionsEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.project.service; + +import com.jero.modules.project.entity.ProjectHistoryVersionsEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 法规清单历史版本表 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +public interface IProjectHistoryVersionsEOService extends IService { + + /** + * 保存 + * + * @param projectHistoryVersionsEO + * @return + */ + void add(ProjectHistoryVersionsEO projectHistoryVersionsEO); + + /** + * 更新 + * + * @param projectHistoryVersionsEO + * @return + */ + void editById(ProjectHistoryVersionsEO projectHistoryVersionsEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProjectHistoryVersionsEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectReplyEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectReplyEOService.java new file mode 100644 index 000000000..af40206d0 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectReplyEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.project.service; + +import com.jero.modules.project.entity.ProjectReplyEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 法规清单回复表 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +public interface IProjectReplyEOService extends IService { + + /** + * 保存 + * + * @param projectReplyEO + * @return + */ + void add(ProjectReplyEO projectReplyEO); + + /** + * 更新 + * + * @param projectReplyEO + * @return + */ + void editById(ProjectReplyEO projectReplyEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProjectReplyEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCommentEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCommentEOServiceImpl.java new file mode 100644 index 000000000..01c9d965d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCommentEOServiceImpl.java @@ -0,0 +1,145 @@ +package com.jero.modules.project.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.common.system.vo.LoginUser; +import com.jero.modules.project.entity.ProjectCommentEO; +import com.jero.modules.project.entity.ProjectReplyEO; +import com.jero.modules.project.mapper.ProjectCommentEOMapper; +import com.jero.modules.project.service.IProjectCommentEOService; +import com.jero.modules.project.service.IProjectReplyEOService; +import com.jero.modules.project.vo.ProjectCommentVO; +import org.apache.shiro.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Date; +import java.util.stream.Collectors; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 法规清单评论表 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +@Service +public class ProjectCommentEOServiceImpl extends ServiceImpl implements IProjectCommentEOService { + + @Autowired + private IProjectReplyEOService iProjectReplyEOService; + /** + * 保存 + * + * @param projectCommentEO + * @return + */ + @Override + public void add(ProjectCommentEO projectCommentEO) { + Date now = new Date(); + projectCommentEO.setCreateTime(now); + projectCommentEO.setUpdateTime(now); + save(projectCommentEO); + } + + /** + * 更新 + * + * @param projectCommentEO + * @return + */ + @Override + public void editById(ProjectCommentEO projectCommentEO) { + Date now = new Date(); + projectCommentEO.setUpdateTime(now); + saveOrUpdate(projectCommentEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ProjectCommentEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } + + @Override + public List getInfoList(ProjectCommentEO projectCommentEOTemp) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + //评论的内容 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(ProjectCommentEO::getCreateBy,sysUser.getUsername()).in(ProjectCommentEO::getProjectLibraryId,projectCommentEOTemp.getProjectLibraryId()); + wrapper.orderByDesc(ProjectCommentEO::getCreateTime); + List projectCommentEOS = this.list(wrapper); + List projectCommentIdList = projectCommentEOS.stream().map(ProjectCommentEO::getId).collect(Collectors.toList()); + + List projectCommentVOList = new ArrayList<>(); + if(projectCommentIdList.size() != 0){ + //回复的内容 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(ProjectReplyEO::getProjectCommentId,projectCommentIdList); + List projectReplyEOList = iProjectReplyEOService.list(lambdaQueryWrapper); + //封装数据 + for (ProjectCommentEO projectCommentEO : projectCommentEOS) { + //每条评论对应的回复 + List projectReplyEOS = projectReplyEOList.stream() + .filter(e -> projectCommentEO.getId().equals(e.getProjectCommentId())).collect(Collectors.toList()); + ProjectCommentVO projectCommentVO = new ProjectCommentVO(); + projectCommentVO.setId(projectCommentEO.getId()); + projectCommentVO.setName(projectCommentEO.getCreateBy()); + projectCommentVO.setCreateTime(projectCommentEO.getCreateTime()); + projectCommentVO.setContent(projectCommentEO.getCommentContent()); + List projectCommentVOS = new ArrayList<>(); + if(projectReplyEOS.size() != 0){ + for (ProjectReplyEO projectReplyEO : projectReplyEOS) { + ProjectCommentVO projectCommentVOTemp = new ProjectCommentVO(); + projectCommentVOTemp.setName(projectReplyEO.getCreateBy()); + projectCommentVOTemp.setCreateTime(projectReplyEO.getCreateTime()); + projectCommentVOTemp.setContent(projectReplyEO.getReplyContent()); + projectCommentVOS.add(projectCommentVOTemp); + } + projectCommentVO.setProjectCommentVOList(projectCommentVOS); + } + projectCommentVOList.add(projectCommentVO); + } + } + return projectCommentVOList; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectHistoryVersionsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectHistoryVersionsEOServiceImpl.java new file mode 100644 index 000000000..deeb25fca --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectHistoryVersionsEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.project.service.impl; + +import com.jero.modules.project.entity.ProjectHistoryVersionsEO; +import com.jero.modules.project.mapper.ProjectHistoryVersionsEOMapper; +import com.jero.modules.project.service.IProjectHistoryVersionsEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 法规清单历史版本表 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +@Service +public class ProjectHistoryVersionsEOServiceImpl extends ServiceImpl implements IProjectHistoryVersionsEOService { + + /** + * 保存 + * + * @param projectHistoryVersionsEO + * @return + */ + @Override + public void add(ProjectHistoryVersionsEO projectHistoryVersionsEO) { + Date now = new Date(); + projectHistoryVersionsEO.setCreateTime(now); + projectHistoryVersionsEO.setUpdateTime(now); + save(projectHistoryVersionsEO); + } + + /** + * 更新 + * + * @param projectHistoryVersionsEO + * @return + */ + @Override + public void editById(ProjectHistoryVersionsEO projectHistoryVersionsEO) { + Date now = new Date(); + projectHistoryVersionsEO.setUpdateTime(now); + saveOrUpdate(projectHistoryVersionsEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ProjectHistoryVersionsEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 8b3ca0ec4..c93d6e474 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.vo.Result; import com.jero.common.constant.CommonConstant; import com.jero.common.constant.WebsocketConst; @@ -24,7 +25,13 @@ import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectNameInfoEO; import com.jero.modules.project.entity.ProjectRelatedPersonnel; -import com.jero.modules.project.enums.*; +import com.jero.modules.project.enums.InventoryAffirmStatusEnum; +import com.jero.modules.project.enums.MsgTypeEnum; +import com.jero.modules.project.enums.OperatorResultEnum; +import com.jero.modules.project.enums.OperatorTypeEnum; +import com.jero.modules.project.enums.ProjectRoleEnum; +import com.jero.modules.project.enums.RequestSourceEnum; +import com.jero.modules.project.enums.TaskAffirmStatusEnum; import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper; import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; @@ -44,15 +51,18 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; import java.util.stream.Collectors; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import javax.servlet.http.HttpServletRequest; - /** * @Description: 项目库-法规清单表 * @Author: jero-boot @@ -121,6 +131,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl clazz, String title,String cut){ - List records = new ArrayList<>();; - + List records=new ArrayList<>(); +// ProjectRelatedPersonnel projectRelatedPersonnel=new ProjectRelatedPersonnel(); // Step.1 组装查询条件 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); ExportParams exportParams=null; // Step.2 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); try { - String fillingExplanationCN="填写说明\n" + - "1.导入数据从第三行开始,第一行为表头,第二行为填写说明,第三行是正式数据\n" + - "2.所有带*号的字段必须填写\n" + - "3.填写人员时，必须使用人员账号进行填写。\n" + - "4.填写的人员账号必须与系统中账号保持一致"; //中英切换模板 - /* if(CutEnum.CN.getValue().equals(cut)) { - - exportParams=new ExportParams(title , fillingExplanationCN, title); + if(CutEnum.CN.getValue().equals(cut)) { + //projectRelatedPersonnel.setDutyTerritory(ExportTemplateEnum.DUTY_TERRITORY_FIELD_of_PRODUCTION.getName()); + exportParams=new ExportParams(title , null, title); }else{ - - exportParams=new ExportParams(title , ExportTemplateEnum.FILLING_EXPLANATION_EN.getName(), title); - }*/ - exportParams=new ExportParams(); - exportParams.setSheetName(title); - //查标签内容里的责任领域数据 + //projectRelatedPersonnel.setDutyTerritory(ExportTemplateEnum.DUTY_TERRITORY_FIELD_of_PRODUCTION.getValue()); + exportParams=new ExportParams(title , null, title); + } +//查标签内容里的责任领域数据 List dictItemNameList = sysDictMapper.queryDictNameByCode(DictCodeEnum.DUTY_TERRITORY.getValue()); //新建相关人员表里的责任领域数据 if (CollectionUtils.isNotEmpty(dictItemNameList)) { @@ -441,7 +431,6 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl entity : fileMap.entrySet()) { MultipartFile file = entity.getValue();// 获取上传文件对象 ImportParams params = new ImportParams(); - params.setTitleRows(2); + params.setTitleRows(1); params.setHeadRows(1); params.setNeedSave(true); try { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectReplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectReplyEOServiceImpl.java new file mode 100644 index 000000000..2e924f46f --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectReplyEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.project.service.impl; + +import com.jero.modules.project.entity.ProjectReplyEO; +import com.jero.modules.project.mapper.ProjectReplyEOMapper; +import com.jero.modules.project.service.IProjectReplyEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 法规清单回复表 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +@Service +public class ProjectReplyEOServiceImpl extends ServiceImpl implements IProjectReplyEOService { + + /** + * 保存 + * + * @param projectReplyEO + * @return + */ + @Override + public void add(ProjectReplyEO projectReplyEO) { + Date now = new Date(); + projectReplyEO.setCreateTime(now); + projectReplyEO.setUpdateTime(now); + save(projectReplyEO); + } + + /** + * 更新 + * + * @param projectReplyEO + * @return + */ + @Override + public void editById(ProjectReplyEO projectReplyEO) { + Date now = new Date(); + projectReplyEO.setUpdateTime(now); + saveOrUpdate(projectReplyEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ProjectReplyEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java index 531e4672a..7cb20e77b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java @@ -198,6 +198,14 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl ProjectCommentVOList; + + + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index a36600081..8d1642928 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -83,6 +83,7 @@ import java.io.*; import java.nio.file.Files; import java.nio.file.Paths; import java.nio.file.StandardOpenOption; +import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -917,6 +918,9 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl
- +
@@ -560,6 +561,8 @@ this.getList() }, searchReset() { + this.$refs.globalAdvancedQueryRef.resetLine() + this.$refs.globalAdvancedQueryRef.emitCallback() this.queryParam = {} this.getList() }, @@ -625,8 +628,8 @@ } }) }, - getPersonnelList(){ - this.getList() + getPersonnelList() { + this.getList() }, batSettingList() { this.getList() diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue index d2c3664f3..ccaaf9a15 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/index.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue @@ -88,6 +88,25 @@ />
+ + + + + + {{$t('parameterTemplate')}} + + + + + +
+ {{$t('cancel')}} + {{$t('submit')}} +
+ @@ -120,7 +139,8 @@ export default { add: 'params/template/add', edit: 'params/template/edit', deleteBatch: 'params/template/delete', - deleteAll: 'params/template/deleteBatch' + deleteAll: 'params/template/deleteBatch', + copy: 'params/template/copyById' }, total: 0, pageSize: 10, @@ -169,13 +189,29 @@ export default { scopedSlots: { customRender: 'operation' } } ], - queryParam: {} + queryParam: {}, + areaVisible:false, + paramsTemplateName: '', } }, mounted() { this.getList() }, methods: { + handleCancel() { + this.areaVisible=false + }, + handleSubmit() { + getAction(this.url.copy + `?id=${this.selectedRowKeys[0]}¶msTemplateName=${this.paramsTemplateName}`, {}).then((res) => { + if (res.success) { + this.areaVisible=false + this.$message.success(res.message) + this.getList() + } else { + this.$message.warning(res.message) + } + }) + }, handleToggleSearch() { this.toggleSearchStatus = !this.toggleSearchStatus }, @@ -189,7 +225,16 @@ export default { }, // 复制 handlecody(){ - + if (this.selectedRowKeys.length > 1) { + this.$message.warning(this.$t('OnlyOneSelected')) + } else if(this.selectedRowKeys.length == 0){ + this.$message.warning(this.$t('pleaseSelectData')) + } else { + this.areaVisible=true + } + }, + hideModal(){ + this.visible = false; }, //批量删除 handleDel() { diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 6ed2adc1b..a51b72e89 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -213,7 +213,7 @@ - +
@@ -287,32 +287,28 @@ export default { props: ['url'], data() { return { - isRequired: [ // 是否必填 - {value:1, label: '是' }, - {value:0, label: '否' } - ], controlType: [ // 控件类型 - {value:1, label: '文本' }, - {value:2, label: '下拉单选' }, - {value:3, label: '下拉多选' }, - {value:4, label: '附件' }, - {value:5, label: '文本+下拉单选' }, - {value:6, label: '文本+下拉多选' }, - {value:7, label: '文本+附件' }, - {value:8, label: '下拉单选+附件' }, - {value:9, label: '下拉多选+附件' }, - {value:10, label: '文本+下拉单选+附件' }, + {value:'1', label: '文本' }, + {value:'2', label: '下拉单选' }, + {value:'3', label: '下拉多选' }, + {value:'4', label: '附件' }, + {value:'5', label: '文本+下拉单选' }, + {value:'6', label: '文本+下拉多选' }, + {value:'7', label: '文本+附件' }, + {value:'8', label: '下拉单选+附件' }, + {value:'9', label: '下拉多选+附件' }, + {value:'10', label: '文本+下拉单选+附件' }, ], controlVerification: [ // 控件校验 - {value:1, label: '无' }, - {value:2, label: '中文' }, - {value:3, label: '正整数' }, - {value:4, label: '正浮点数' }, - {value:5, label: '整数或小数' }, - {value:6, label: '一位小数' }, - {value:7, label: '两位小数' }, - {value:8, label: '三位小数' }, - {value:9, label: '四位小数' }, + {value:'1', label: '无' }, + {value:'2', label: '中文' }, + {value:'3', label: '正整数' }, + {value:'4', label: '正浮点数' }, + {value:'5', label: '整数或小数' }, + {value:'6', label: '一位小数' }, + {value:'7', label: '两位小数' }, + {value:'8', label: '三位小数' }, + {value:'9', label: '四位小数' }, ], CategoryTreeList: [], // 技术领域 certCategoryParamsInfoEOList: [], // 认证类别得tab栏 @@ -343,7 +339,7 @@ export default { projectNameList: [], title: '', stateOne: '', - tt : [] + contentList : [] } }, mounted() { @@ -380,7 +376,7 @@ export default { // this.formInline.certCategoryParamsInfoEOList = [] val.forEach((item) => { - this.tt.push({ + this.contentList.push({ textVal: item.text, // tab certCategory: '', // 所属认证类别 paramsNumber: '', // 编号 @@ -429,38 +425,45 @@ export default { this.visible = false }, handleSubmit() { - this.$refs.ruleForm.validate(valid => { - if (valid) { - let url = '' - let Action - if (this.formInline.id) { - url = this.url.edit - Action = postAction - } else { - url = this.url.add - Action = postAction - } - let query = JSON.parse(JSON.stringify(this.formInline)) - console.log(query,'queryqueryqueryquery') - Object.keys(query).forEach(res => { - if (query[res] && query[res] instanceof Array) { - query[res] = query[res].join(',') - } - }) - let querytt = JSON.parse(JSON.stringify(this.tt)) - query.certCategoryParamsInfoEOList = querytt - this.confirmLoading = true - Action(url, query).then((res) => { - if (res.success) { - this.confirmLoading = false - this.$message.success(this.$t('OperationSuccessful')) - this.visible = false - this.$emit('addModelList') - } else { - this.$message.warning(res.message) - this.confirmLoading = false + // 校验nio编号 + getAction(this.url.checkNIOnumber + `?nioNumber=${this.formInline.nioNumber}`, {} ).then((res) => { + if (res) { + this.$refs.ruleForm.validate(valid => { + if (valid) { + let url = '' + let Action + this.formInline.paramsTemplateId = this.$route.query.id + if (this.formInline.id) { + url = this.url.edit + Action = postAction + } else { + url = this.url.add + Action = postAction + } + let query = JSON.parse(JSON.stringify(this.formInline)) + Object.keys(query).forEach(res => { + if (query[res] && query[res] instanceof Array) { + query[res] = query[res].join(',') + } + }) + let querycontentList = JSON.parse(JSON.stringify(this.contentList)) + query.certCategoryParamsInfoEOList = querycontentList + this.confirmLoading = true + Action(url, query).then((res) => { + if (res.success) { + this.confirmLoading = false + this.$message.success(this.$t('OperationSuccessful')) + this.visible = false + this.$emit('addModelList') + } else { + this.$message.warning(res.message) + this.confirmLoading = false + } + }) } }) + } else { + this.$message.warning(this.$t('NiOnumberalreadyexists')) } }) }, diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index f964d48c9..e0f74cf14 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -44,9 +44,16 @@ {{$t('add')}}
-
- - {{$t('copy')}} +
+ + {{$t('dataExport')}} +
+
+ + {{$t('templateDownload')}} +
+
+
@@ -65,6 +72,7 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > + {{text}} @@ -90,18 +98,21 @@ + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/fixedPlateForm.vue b/jero-web/src/views/projectManagement/components/fixedPlateForm.vue new file mode 100644 index 000000000..26fc25c51 --- /dev/null +++ b/jero-web/src/views/projectManagement/components/fixedPlateForm.vue @@ -0,0 +1,133 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/historicalVersionList.vue b/jero-web/src/views/projectManagement/components/historicalVersionList.vue index 372d5d7ae..4066ed627 100644 --- a/jero-web/src/views/projectManagement/components/historicalVersionList.vue +++ b/jero-web/src/views/projectManagement/components/historicalVersionList.vue @@ -20,17 +20,6 @@ {{$t('See')}} -
- -
@@ -38,16 +27,15 @@ import { getAction, postAction, } from '@/api/manage' export default { name: 'historicalVersionList', - props:['url'], data(){ return{ visible:false, confirmLoading:false, dataSource:[], loading:false, - pageNo: 1, - pageSize: 10, - total: 0, + url:{ + list:'project/projectHistoryVersionsEO/list', + }, columns: [ { title: this.$t('versionName'), @@ -76,7 +64,6 @@ methods:{ getList(){ this.visible = true - this.pageNo = 1 this.historicalList() }, handleOk() { @@ -85,26 +72,14 @@ handleCancel() { this.visible = false }, - onChange(page, pageSize) { - this.pageNo = page - this.historicalList() - }, - SizeChange(page, pageSize) { - this.pageNo = 1 - this.pageSize = pageSize - this.historicalList() - }, historicalList(){ let query = { - pageNo: this.pageNo, - pageSize: this.pageSize, - documentId: this.$route.query.id + projectLibraryId: this.$route.query.id } this.loading = true - getAction(this.url.historicalVersionUrl, query).then((res) => { + getAction(this.url.list, query).then((res) => { if (res.success) { - this.dataSource = res.result.records - this.total = res.result.total + this.dataSource = res.result || [] this.loading = false } else { this.loading = false diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index e648d61e4..a0578483c 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -1,6 +1,6 @@