diff --git a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java index f6acc783..9527214a 100644 --- a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java +++ b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java @@ -29,6 +29,8 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authz.annotation.Logical; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -65,6 +67,7 @@ public class SarFileCompareInfoController extends JeroController { @@ -79,6 +80,7 @@ public class SarFileCompareItemCommentController extends JeroController overseasAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java index c900f0e8..46d7e291 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java @@ -1,10 +1,6 @@ package com.jero.modules.projectLibrary.controller; -import java.util.Arrays; -import java.util.List; -import java.util.Map; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; import com.jero.common.util.MessageUtils; @@ -14,7 +10,6 @@ import com.jero.modules.projectLibrary.service.ILawsEvaluationNotMetService; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; -import org.apache.ibatis.annotations.Results; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -22,7 +17,6 @@ import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.jero.common.aspect.annotation.AutoLog; -import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.formula.functions.T; @@ -42,12 +36,6 @@ public class LawsEvaluationNotMetController extends JeroController> queryList(LawsEvaluationNotMet lawsEvaluationNotMet, HttpServletRequest req) { - List list = lawsEvaluationNotMetService.queryList(lawsEvaluationNotMet, req); - return Result.OK(list); - } - /** * 添加 - * - * @param lawsEvaluationNotMet - * @return */ @AutoLog(value = "评估未符合项条款-添加") @ApiOperation(value="评估未符合项条款-添加", notes="评估未符合项条款-添加") @@ -91,9 +61,6 @@ public class LawsEvaluationNotMetController extends JeroController delete(@RequestBody Map map) { - if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ - throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA); - } - lawsEvaluationNotMetService.deleteById(map.get("id")); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - /** - * 批量删除 - * - * @param map - * @return - */ - @AutoLog(value = "评估未符合项条款-批量删除") - @ApiOperation(value="评估未符合项条款-批量删除", notes="评估未符合项条款-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody Map map) { - if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ - throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA); - } - this.lawsEvaluationNotMetService.deleteByIds(Arrays.asList(map.get("ids").split(","))); - return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK)); - } /** * 通过id查询 - * - * @param id - * @return */ @AutoLog(value = "评估未符合项条款-通过id查询") @ApiOperation(value="评估未符合项条款-通过id查询", notes="评估未符合项条款-通过id查询") @@ -156,25 +88,10 @@ public class LawsEvaluationNotMetController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, LawsEvaluationNotMet.class); - } - } diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java index ea864ae0..6cc97a68 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java @@ -1,9 +1,8 @@ package com.jero.modules.projectLibrary.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; import java.util.Date; -import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -16,7 +15,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** @@ -36,82 +34,105 @@ public class LawsEvaluationNotMet implements Serializable { /**主键*/ @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; - /**所属部门*/ - @Excel(name = "所属部门", width = 15) - @ApiModelProperty(value = "所属部门") - private java.lang.String orgCode; + private String id; + /**标准ID*/ @Excel(name = "标准ID", width = 15) @ApiModelProperty(value = "标准ID") - private java.lang.String standardId; + private String standardId; + /**标准编号*/ @Excel(name = "标准编号", width = 15) @ApiModelProperty(value = "标准编号") - private java.lang.String standardNumber; + private String standardNumber; + /**项目ID*/ @Excel(name = "项目ID", width = 15) @ApiModelProperty(value = "项目ID") - private java.lang.String projectId; + private String projectId; + /**项目名称*/ @Excel(name = "项目名称", width = 15) @ApiModelProperty(value = "项目名称") - private java.lang.String projectName; + private String projectName; + /**条款ID*/ @Excel(name = "条款ID", width = 15) @ApiModelProperty(value = "条款ID") - private java.lang.String termId; + private String termId; + /**条款号*/ @Excel(name = "条款号", width = 15) @ApiModelProperty(value = "条款号") - private java.lang.String termNum; + private String termNum; + /**条款名称*/ @Excel(name = "条款名称", width = 15) @ApiModelProperty(value = "条款名称") - private java.lang.String termName; + private String termName; + /**责任部门ID*/ @Excel(name = "责任部门ID", width = 15) @ApiModelProperty(value = "责任部门ID") - private java.lang.String departmentId; + private String departmentId; + /**设计工程师ID*/ @Excel(name = "设计工程师ID", width = 15) @ApiModelProperty(value = "设计工程师ID") - private java.lang.String engineerId; + private String engineerId; + /**设计工程师名字*/ @Excel(name = "设计工程师名字", width = 15) @ApiModelProperty(value = "设计工程师名字") - private java.lang.String engineerName; + private String engineerName; + /**预计整改完成日期*/ @Excel(name = "预计整改完成日期", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "预计整改完成日期") - private java.util.Date expectedTime; + private Date expectedTime; + /**实际整改完成日期*/ @Excel(name = "实际整改完成日期", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "实际整改完成日期") - private java.util.Date realityTime; + private Date realityTime; + /**整改状态(1-待整改、2-整改中、3-审批中、4-已完成)*/ @Dict(dicCode = "assess_rectification") @Excel(name = "整改状态(1-待整改、2-整改中、3-审批中、4-已完成)", width = 15) @ApiModelProperty(value = "整改状态(1-待整改、2-整改中、3-审批中、4-已完成)") - private java.lang.String state; + private String state; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + + /**所属部门*/ + @Excel(name = "所属部门", width = 15) + @ApiModelProperty(value = "所属部门") + private String orgCode; + + + /**预计整改完成日期范围*/ + @ApiModelProperty(value = "预计整改完成日期范围") + private String expectedTimeRange; } diff --git a/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java b/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java index 2cffddf2..623e738d 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java +++ b/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java @@ -55,6 +55,7 @@ public class SarFileSplitInfoController extends JeroController