Merge remote-tracking branch 'origin/develop_master' into develop_master

2022-01-24 22:22:39 +08:00
parent d2dfa6b2b0 b992c47c94
commit 3c295a6e3e
10 changed files with 430 additions and 7 deletions
@@ -0,0 +1,51 @@
+package com.adc.da.slrs.sarBussionessStandState.controller;
+
+
+import com.adc.da.http.PageInfo;
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage;
+import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService;
+import com.adc.da.util.LoginUserUtil;
+import com.adc.da.util.utils.StringUtils;
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+import java.util.List;
+
+/**
+* <p>
+    * 企业标准信息复审表 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2022-01-23
+*/
+@RestController
+@Api(tags = "福田标准法规--企业复审信息")
+@RequestMapping("/${restPath}/lawss/sarBussionessStandState")
+public class SarBussionessStandStateController extends BaseController<SarBussionessStandState> {
+
+    @Autowired
+    private ISarBussionessStandStateService bussionessStandStateService;
+
+    /**
+     * 自定义分页查询列表
+     * @param page  标准信息
+     * @return
+     */
+    @ApiOperation(value = "|SarBussionessStandState|自定义分页查询列表")
+    @GetMapping("/getSarBussionStandPage")
+    //@RequiresPermissions("lawss:sarBussionessStand:getSarBussionStandPage")
+    public ResponseMessage<PageInfo<SarBussionessStandState>> getSarBussionessStandStatePage(SarBussionessStandStatePage page) throws Exception {
+        List<SarBussionessStandState> rows = bussionessStandStateService.getSarBussionessStandStatePage(page);
+        return Result.success(getPageInfo(page.getPager(), rows));
+    }
+}
@@ -0,0 +1,23 @@
+package com.adc.da.slrs.sarBussionessStandState.dao;
+
+import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState;
+import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 企业标准信息复审表 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2022-01-23
+ */
+public interface SarBussionessStandStateDao extends BaseMapper<SarBussionessStandState> {
+
+    List<SarBussionessStandState> getBussionessStandStatePage(SarBussionessStandStatePage page);
+
+    int getBussionessStandStateCount(SarBussionessStandStatePage page);
+
+}
@@ -0,0 +1,84 @@
+package com.adc.da.slrs.sarBussionessStandState.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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;
+
+/**
+ * <p>
+ * 企业标准信息复审表
+ * </p>
+ *
+ * @author super_liu
+ * @since 2022-01-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SarBussionessStandState对象", description="企业标准信息复审表")
+public class SarBussionessStandState extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键/企业标准信息主键")
+    @TableField("ID")
+    private String id;
+
+    @ApiModelProperty(value = "企标ID")
+    @TableField("STAND_ID")
+    private String standId;
+
+    @ApiModelProperty(value = "名称")
+    @TableField("STAND_NAME")
+    private String standName;
+
+    @ApiModelProperty(value = "企标编号")
+    @TableField("STAND_CODE")
+    private String standCode;
+
+    @ApiModelProperty(value = "复审时间")
+    @TableField("REVIEW_TIME")
+    private Date reviewTime;
+
+    @ApiModelProperty(value = "发布日期")
+    @TableField("ISSUE_TIME")
+    private Date issueTime;
+
+    @ApiModelProperty(value = "复审结果 1 修订、2 废止、3 继续有效")
+    @TableField("REVIEW_RESULTS")
+    private Integer reviewResults;
+
+    @ApiModelProperty(value = "复审关联流程编号")
+    @TableField("REVIEW_PROCESS_NUM")
+    private String reviewProcessNum;
+
+    @ApiModelProperty(value = "创建日期")
+    @TableField("CREATION_TIME")
+    private Date creationTime;
+
+    @ApiModelProperty(value = "更新日期")
+    @TableField("MODIFY_TIME")
+    private Date modifyTime;
+
+    @TableField("VALID_FLAG")
+    private Integer validFlag;
+
+    @ApiModelProperty(value = "参数1")
+    @TableField("PARAM1")
+    private Integer param1;
+
+    @ApiModelProperty(value = "参数2")
+    @TableField("PARAM2")
+    private String param2;
+
+
+}
@@ -0,0 +1,74 @@
+package com.adc.da.slrs.sarBussionessStandState.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.adc.da.sys.common.BasePage;
+import com.baomidou.mybatisplus.annotation.TableField;
+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 java.util.Date;
+
+/**
+ * <p>
+ * 企业标准信息复审表
+ * </p>
+ *
+ * @author super_liu
+ * @since 2022-01-23
+ */
+@Data
+@ApiModel(value="SarBussionessStandStatePage对象", description="企业标准信息复审表分页")
+public class SarBussionessStandStatePage extends BasePage {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键/企业标准信息主键")
+    private String id;
+
+    @ApiModelProperty(value = "企标ID")
+    private String standId;
+
+    @ApiModelProperty(value = "名称")
+    private String standName;
+
+    @ApiModelProperty(value = "企标编号")
+    private String standCode;
+
+    @ApiModelProperty(value = "复审时间")
+    private Date reviewTime;
+
+    @ApiModelProperty(value = "发布日期")
+    private Date issueTime;
+
+    @ApiModelProperty(value = "复审结果 1 修订、2 废止、3 继续有效")
+    private Integer reviewResults;
+
+    @ApiModelProperty(value = "复审关联流程编号")
+    private String reviewProcessNum;
+
+    @ApiModelProperty(value = "创建日期")
+    private Date creationTime;
+
+    @ApiModelProperty(value = "更新日期")
+    private Date modifyTime;
+
+    private Integer validFlag;
+
+    @ApiModelProperty(value = "参数1")
+    private Integer param1;
+
+    @ApiModelProperty(value = "参数2")
+    private String param2;
+
+    private String reviewTimeStart;
+    private String reviewTimeEnd;
+
+    private String issueTimeStart;
+    private String issueTimeEnd;
+
+
+}
@@ -0,0 +1,21 @@
+package com.adc.da.slrs.sarBussionessStandState.service;
+
+import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState;
+import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 企业标准信息复审表 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2022-01-23
+ */
+public interface ISarBussionessStandStateService extends IService<SarBussionessStandState> {
+
+    List<SarBussionessStandState> getSarBussionessStandStatePage(SarBussionessStandStatePage page) throws Exception;
+
+}
@@ -0,0 +1,30 @@
+package com.adc.da.slrs.sarBussionessStandState.service.impl;
+
+import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState;
+import com.adc.da.slrs.sarBussionessStandState.dao.SarBussionessStandStateDao;
+import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage;
+import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 企业标准信息复审表 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2022-01-23
+ */
+@Service
+public class SarBussionessStandStateServiceImpl extends ServiceImpl<SarBussionessStandStateDao, SarBussionessStandState> implements ISarBussionessStandStateService {
+
+    @Override
+    public List<SarBussionessStandState> getSarBussionessStandStatePage(SarBussionessStandStatePage page) throws Exception{
+        Integer rowCount = this.baseMapper.getBussionessStandStateCount(page);
+        page.getPager().setRowCount(rowCount);
+        List<SarBussionessStandState> stateList = this.baseMapper.getBussionessStandStatePage(page);
+        return stateList;
+    }
+}
@@ -186,6 +186,9 @@ public class SarStandardsInfo extends BaseEntity {
    private String sarStandAttrEOStr; //新增修改时属性表信息
    @TableField(exist = false)
    private String menuId; //目录ID
+
+    @TableField(exist = false)
+    private String menuIds; //目录ID
    @TableField(exist = false)
    private int upReplaceNumFlag; //记录是否修改了替代文件号
    @TableField(exist = false)
@@ -814,13 +814,16 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
        sarStandardsInfoEO.setCreationTime(new Date());
        sarStandardsInfoEO.setModifyTime(new Date());
        //根据新建标准所在目录，确定此处是否需要在标准目录关联表中插入数据
-        if (StringUtils.isNotEmpty(sarStandardsInfoEO.getMenuId())) {
-            SarStandMenu sarStandMenuEO = new SarStandMenu();
-            sarStandMenuEO.setStandId(sarStandardsInfoEO.getId());
-            sarStandMenuEO.setMenuId(sarStandardsInfoEO.getMenuId());
-            sarStandMenuEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue());
-            sarStandMenuEO.setId(UUIDUtils.randomUUID20());
-            sarStandMenuEODao.insert(sarStandMenuEO);
+        if (StringUtils.isNotEmpty(sarStandardsInfoEO.getMenuIds())) {
+
+            for (String menuId : sarStandardsInfoEO.getMenuIds().split(",")) {
+                SarStandMenu sarStandMenuEO = new SarStandMenu();
+                sarStandMenuEO.setStandId(sarStandardsInfoEO.getId());
+                sarStandMenuEO.setMenuId(menuId);
+                sarStandMenuEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue());
+                sarStandMenuEO.setId(UUIDUtils.randomUUID20());
+                sarStandMenuEODao.insert(sarStandMenuEO);
+            }
        }
        // 根据其他字段，生成标准状态
        updateStandState(sarStandardsInfoEO, null);
@@ -1408,6 +1411,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
        sarStandardsInfoEO.setStandState(resultState);
    }

+    @Autowired
+    private ISarStandardsInfoService sarStandardsInfoEOService;
+
+
    /***
     * @Description: 修改标准
     * @Author: yangxuenan
@@ -1458,6 +1465,27 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
        // 修改属性表数据
        sarStandAttrInfoEODao.deleteStandAttrByStandId(standId);
        createStandAttrInfo(sarStandardsInfoEO);
+        /**
+         * 编辑体系目录
+         */
+
+        if (StringUtils.isNotEmpty(sarStandardsInfoEO.getMenuIds())) {
+
+            for (String menuId : sarStandardsInfoEO.getMenuIds().split(",")) {
+                SarStandardsInfoEOPage standardsInfoEO = new SarStandardsInfoEOPage();
+                standardsInfoEO.setMenuId(menuId);
+                standardsInfoEO.setIdlist(new String[]{sarStandardsInfoEO.getId()});
+
+
+                try {
+                    sarStandardsInfoEOService.updateStandardsMenu(standardsInfoEO);
+                }catch (NullPointerException e){
+                    sarStandardsInfoEOService.updateStandInfo(standardsInfoEO);
+                }
+            }
+        }
+
+
        //编写预警信息
 //        writeWarnings(sarStandardsInfoEO);
        //修改标准过程中，重新修改代替标准号对应的标准的被代替标准号