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

adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java

@@ -18,7 +18,7 @@ public class ActDefineStartMap {
         map.put("2","standardSurveyWorkFlow");
         map.put("3","StandAskForOpinion");
         map.put("4","standardregulatoryinventory");
-        map.put("5","projectEvaluationProcess");
+        map.put("5","projectEvaluationNewProcess");
         map.put("6","Projectcomplianceassessment");
 
 

adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java

@@ -14,7 +14,7 @@ public class TableToExcel {
     public static <T extends Object> Workbook createExcel(Map<String,String> columnMap, List<T> dataList, String sheelName, String fileName) {
 
         if(sheelName==null)sheelName="sheet1";
-
+       columnMap.put("a","序号");
         int sheetRow=500;
         sheetRow=sheetRow<0?200:sheetRow;
         //第一步，创建一个webbook，对应一个excel文件，内存中sheetRow条记录后提交。
@@ -36,9 +36,10 @@ public class TableToExcel {
                 Row neckRow = sheet.createRow(1);
                 sheet.addMergedRegion(new CellRangeAddress(0,1,0,0));
                 sheet.addMergedRegion(new CellRangeAddress(0,1,1,1));
-                sheet.addMergedRegion(new CellRangeAddress(0,0,2,4));
+                sheet.addMergedRegion(new CellRangeAddress(0,1,2,2));
-                sheet.addMergedRegion(new CellRangeAddress(0,1,5,5));
+                sheet.addMergedRegion(new CellRangeAddress(0,0,3,5));
                 sheet.addMergedRegion(new CellRangeAddress(0,1,6,6));
+                sheet.addMergedRegion(new CellRangeAddress(0,1,9,9));
                 sheet.addMergedRegion(new CellRangeAddress(0,1,7,7));
                 sheet.addMergedRegion(new CellRangeAddress(0,1,8,8));
                 //生成表头行
@@ -46,39 +47,51 @@ public class TableToExcel {
 
                 for(String key:keys) {
                     Cell hCell=headRow.createCell(j++);
-                    if (j<3)
+                    if (j<4)
                         hCell.setCellValue(columnMap.get(key));
                 }
                 if (null!=columnMap.get("commentText")) {
-                    Cell hCellh = headRow.createCell(2);
+                    Cell hCellh = headRow.createCell(3);
                     hCellh.setCellValue("修改意见内容");
                 }
+                if (null!=columnMap.get("a")) {
+                    Cell hCellh = headRow.createCell(0);
+                    hCellh.setCellValue("序号");
+                }
+                if (null!=columnMap.get("chapterNumber")) {
+                    Cell hCellh = headRow.createCell(1);
+                    hCellh.setCellValue("章条编号");
+                }
+                if (null!=columnMap.get("chapterName")) {
+                    Cell hCellh = headRow.createCell(2);
+                    hCellh.setCellValue("章节名称");
+                }
                 if (null!=columnMap.get("department")) {
-                    Cell hCell = headRow.createCell(5);
+                    Cell hCell = headRow.createCell(6);
                     hCell.setCellValue("提出部门");
                 }
                 if (null!=columnMap.get("responUserName")) {
-                    Cell hCell1 = headRow.createCell(6);
+                    Cell hCell1 = headRow.createCell(7);
                     hCell1.setCellValue("提出人");
                 }
                 if (null!=columnMap.get("stateText")) {
-                    Cell hCell2 = headRow.createCell(7);
+                    Cell hCell2 = headRow.createCell(8);
                     hCell2.setCellValue("处理意见");
                 }
                 if (null!=columnMap.get("oldText")) {
-                    Cell nCell = neckRow.createCell(2);
+                    Cell nCell = neckRow.createCell(3);
                     nCell.setCellValue("修改前");
                 }
                 if (null!=columnMap.get("newText")) {
-                    Cell nCell1 = neckRow.createCell(3);
+                    Cell nCell1 = neckRow.createCell(4);
                     nCell1.setCellValue("修改后");
                 }
                 if (null!=columnMap.get("reason")) {
-                    Cell nCell1 = neckRow.createCell(4);
+                    Cell nCell1 = neckRow.createCell(5);
                     nCell1.setCellValue("修改理由");
                 }
                 if (null!=columnMap.get("cause")) {
-                    Cell nCell1 = headRow.createCell(8);
+                    Cell nCell1 = headRow.createCell(9);
                     nCell1.setCellValue("原因");
                 }
 
@@ -89,7 +102,8 @@ public class TableToExcel {
                     T t=dataList.get(k);
                     Row dataRow=sheet.createRow(c++);
                     //循环取值进行数据填充
-                    int v=0;
+                    int v=1;
+                    dataRow.createCell(0).setCellValue(k+1);
                     for(String key:keys) {
                         if (!"commentText".equals(key)) {
                             try {

adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java

@@ -199,8 +199,11 @@ public class ActSarItemsEOService {
             List<SarStandardsInfo> standlist = sarStandardsInfoEOService.selectStandardsByStandnumber(standnumber, sarStandardsInfoEO.getStandType());
             if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) {
                 sarStandardsInfoEO.setMenuId("64df1d5522bb49c09af2");
+                sarStandardsInfoEO.setMenuIds("64df1d5522bb49c09af2,"+sarStandardsInfoEO.getMenuIds());
                 sarStandardsInfoEO.setCountry("CN");
             } else if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "FOREIGN".equals(sarStandardsInfoEO.getStandType())) {
+
+                sarStandardsInfoEO.setMenuIds("22179d54d4e640098e29,"+sarStandardsInfoEO.getMenuIds());
                 sarStandardsInfoEO.setMenuId("22179d54d4e640098e29");
             }
             //此处判断是否是带入的标准
@@ -1109,6 +1112,7 @@ public class ActSarItemsEOService {
             case "standSort": sarStandardsInfoEO.setStandSort(valueStr); break;
             case "standState": sarStandardsInfoEO.setStandState(valueStr); break;
             case "menuId": sarStandardsInfoEO.setMenuId(valueStr); break;
+            case "menuIds": sarStandardsInfoEO.setMenuIds(valueStr); break;
             case "textStatus": sarStandardsInfoEO.setTextStatus(valueStr); break;
             case "synopsis": sarStandardsInfoEO.setSynopsis(valueStr); break;
             case "fileWord":

adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java

@@ -110,8 +110,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
     addInterceptor.excludePathPatterns("/api/lawss/activiti/loginMobile");
 
 
-//    //测试接口使用
+////    //测试接口使用
-    addInterceptor.excludePathPatterns("/api/**");
+//    addInterceptor.excludePathPatterns("/api/**");
 
 
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java

@@ -22,6 +22,8 @@ import java.util.List;
 @Repository
 public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
 
+    List<SarBussionessStand> queryByBussStateSync(SarBussionessStand sarBussionessStand);
+
     SarBussionessStand getStandInfoByReviseStatus(String reviseStatus);
 
     SarBussionessStand selectByPrimaryKey(String standId);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java

@@ -124,6 +124,11 @@ public class SarBussionessStand extends BaseEntity {
     @TableField(exist = false)
     private String newStandSn;
 
+    /**
+     * 代替企标标准号
+     */
+    @TableField(exist = false)
+    private String DTQBBHBUSS;
 
     @TableField(exist = false)
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@@ -214,6 +219,17 @@ public class SarBussionessStand extends BaseEntity {
     @TableField(exist = false)
     private List<SarStandAttrDetailsEO> attrInfoList = new ArrayList<>();
 
+    /**
+     * 新增条件字段
+     * @return
+     */
+    @TableField(exist = false)
+    private String reviewTime;
+    @TableField(exist = false)
+    private String issueTimeStart;
+    @TableField(exist = false)
+    private String issueTimeEnd;
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/controller/SarBussionessStandStateController.java

@@ -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));
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/dao/SarBussionessStandStateDao.java

@@ -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);
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java

@@ -0,0 +1,90 @@
+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.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <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 = "主键/企业标准信息主键")
+    @TableId(value = "ID", type = IdType.UUID)
+    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")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String reviewTime;
+
+    @ApiModelProperty(value = "发布日期")
+    @TableField("ISSUE_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String 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")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private String creationTime;
+
+    @ApiModelProperty(value = "更新日期")
+    @TableField("MODIFY_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private String modifyTime;
+
+    @TableField("VALID_FLAG")
+    private Integer validFlag;
+
+    @ApiModelProperty(value = "参数1")
+    @TableField("PARAM1")
+    private Integer param1;
+
+    @ApiModelProperty(value = "参数2")
+    @TableField("PARAM2")
+    private String param2;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java

@@ -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;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/ISarBussionessStandStateService.java

@@ -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;
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/impl/SarBussionessStandStateServiceImpl.java

@@ -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;
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/sync/StateSync.java

@@ -0,0 +1,257 @@
+package com.adc.da.slrs.sarBussionessStandState.sync;
+
+import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao;
+import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
+import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState;
+import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService;
+import com.adc.da.util.DateUtils;
+import com.adc.da.utils.util.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @Description: TODO
+ * @author: super_liu
+ * @date: 2022年01月25日 3:34
+ */
+@EnableScheduling
+@Component
+@Slf4j
+public class StateSync {
+    Logger logger = LoggerFactory.getLogger(StateSync.class);
+
+    @Autowired
+    private SarBussionessStandDao sarBussionessStandDao;
+
+    @Autowired
+    private ISarBussionessStandStateService bussionessStandStateService;
+
+    /**
+     * 根据配置文件设置是否开启定时器
+     */
+
+    @Value("${isNotScheduled}")
+    private boolean isNotScheduled; //是否开启定时器
+
+
+    // 月初
+    @Scheduled(cron="0 0 1 1 * ?")
+//    @Scheduled(cron="*/5 * * * * ?")
+    @Async
+    public void StandScheduledJobMonthBegin(){
+        if(isNotScheduled){
+            try{
+                Thread.sleep(2000);
+                logger.info("月初:"+Thread.currentThread().getName() + " cron=0 0 1 1 * ? --- " + new Date()+"---START-01");
+                String nowFirst = DateUtil.firstOneDay(DateUtil.printDate(new Date()));
+                String nowFin = DateUtil.finOneDay(DateUtil.printDate(new Date()));
+                String nowFinByQuery = DateUtil.addDay(DateUtil.finOneDay(DateUtil.printDate(new Date())),1);
+                System.out.println("当前月第一日:"+nowFirst);
+                System.out.println("当前月最后一日:"+nowFin);
+
+                SarBussionessStand stand = new SarBussionessStand();
+                stand.setIssueTimeStart(nowFirst);
+                stand.setIssueTimeEnd(nowFin);
+                List<SarBussionessStand> standList = sarBussionessStandDao.queryByBussStateSync(stand);
+                if(!standList.isEmpty()){
+                    List<SarBussionessStandState> filterList = new ArrayList<>();
+                    standList.forEach(sarBussionessStand -> {
+                        SarBussionessStandState state = new SarBussionessStandState();
+                        state.setStandId(sarBussionessStand.getId());
+                        state.setStandCode(sarBussionessStand.getStandCode());
+                        state.setStandName(sarBussionessStand.getStandName());
+                        if(DateUtil.printToDate(sarBussionessStand.getIssueTime()) != null){
+                            state.setIssueTime(sarBussionessStand.getIssueTime());
+                        }
+                        if(DateUtil.printToDate(sarBussionessStand.getReviewTime()) != null){
+                            state.setReviewTime(sarBussionessStand.getReviewTime());
+                        }
+                        state.setCreationTime(DateUtil.printDateAll(new Date()));
+                        state.setModifyTime(DateUtil.printDateAll(new Date()));
+                        filterList.add(state);
+                    });
+                    List<SarBussionessStandState> insList = new ArrayList<>();
+                    List<SarBussionessStandState> updList = new ArrayList<>();
+                    QueryWrapper wrapper = new QueryWrapper();
+                    wrapper.isNull("REVIEW_RESULTS");
+                    wrapper.between("REVIEW_TIME",nowFirst,nowFinByQuery);
+                    List<SarBussionessStandState> stateList = bussionessStandStateService.list(wrapper);
+                    if(!stateList.isEmpty()){
+                        // 差集 (list1 - list2) 新增复审表
+                        List<SarBussionessStandState> distinctByUniqueList = filterList.stream()
+                                .filter(item -> !stateList.stream()
+                                        .map(SarBussionessStandState::getStandId)
+                                        .collect(Collectors.toList())
+                                        .contains(item.getStandId()))
+                                .collect(Collectors.toList());
+                        insList.addAll(distinctByUniqueList);
+
+                        // 交集 更新复审表
+                        List<SarBussionessStandState> intersection = filterList.stream()
+                                .filter(item -> stateList.stream()
+                                        .map(SarBussionessStandState::getStandId)
+                                        .collect(Collectors.toList())
+                                        .contains(item.getStandId()))
+                                .collect(Collectors.toList());
+
+                        // jdk8 stream 更新集合批量赋值ID
+                        List<SarBussionessStandState> updSetList = intersection.stream()
+                                .map(upObj -> stateList.stream()
+                                        .filter(stateQueryObj -> upObj.getStandId().equals(stateQueryObj.getStandId()))
+                                        .findFirst()
+                                        .map(stateQueryObj -> {
+                                            upObj.setId(stateQueryObj.getId());
+                                            upObj.setModifyTime(DateUtil.printDateAll(new Date()));
+                                            return upObj;
+                                        }).orElse(null))
+                                .collect(Collectors.toList());
+                        updList.addAll(updSetList);
+
+                    }else {
+                        // 新增复审表
+                        insList.addAll(filterList);
+                    }
+
+                    // 复审表操作逻辑 新增
+                    if(!insList.isEmpty()){
+                        bussionessStandStateService.saveBatch(insList);
+                    }
+
+                    // 复审表操作逻辑 更新
+                    if(!updList.isEmpty()){
+//                        List<SarBussionessStandState> updListResult = updList.stream().peek(p -> p.setModifyTime(DateUtil.printDateAll(new Date()))).collect(Collectors.toList());
+                        bussionessStandStateService.updateBatchById(updList);
+                    }
+
+                }
+
+                logger.info("月初:"+Thread.currentThread().getName() + " cron=0 0 1 1 * ? --- " + new Date()+"---End-01");
+            }catch(Exception e){
+                logger.info(e.getMessage());
+            }
+        }
+    }
+
+    // 月末
+    @Scheduled(cron="0 0 1 28-31 * ?")
+//    @Scheduled(cron="*/5 * * * * ?")
+    @Async
+    public void StandScheduledJobMonthEnd(){
+        if(isNotScheduled){
+            try{
+                Thread.sleep(2000);
+                // 判断当前日期是否为月末
+                Date date = new Date();
+                if(isLastDayOfMonth(date)){
+                    logger.info("月末:"+Thread.currentThread().getName() + " cron=0 0 1 28-31 * ? --- " + new Date()+"---START-01");
+                    String nextFirst = DateUtil.printDate(DateUtil.nextMonthFirstDate());
+                    String nextFin = DateUtil.finOneDay(DateUtil.printDate(DateUtil.nextMonthFirstDate()));
+                    String nextFinByQuery = DateUtil.addDay(DateUtil.finOneDay(DateUtil.printDate(DateUtil.nextMonthFirstDate())),1);
+                    System.out.println("下个月第一日:"+ nextFirst);
+                    System.out.println("下个月最后一日:"+nextFin);
+
+                    SarBussionessStand stand = new SarBussionessStand();
+                    stand.setIssueTimeStart(nextFirst);
+                    stand.setIssueTimeEnd(nextFin);
+                    List<SarBussionessStand> standList = sarBussionessStandDao.queryByBussStateSync(stand);
+                    if(!standList.isEmpty()){
+                        List<SarBussionessStandState> filterList = new ArrayList<>();
+                        standList.forEach(sarBussionessStand -> {
+                            SarBussionessStandState state = new SarBussionessStandState();
+                            state.setStandId(sarBussionessStand.getId());
+                            state.setStandCode(sarBussionessStand.getStandCode());
+                            state.setStandName(sarBussionessStand.getStandName());
+                            if(DateUtil.printToDate(sarBussionessStand.getIssueTime()) != null){
+                                state.setIssueTime(sarBussionessStand.getIssueTime());
+                            }
+                            if(DateUtil.printToDate(sarBussionessStand.getReviewTime()) != null){
+                                state.setReviewTime(sarBussionessStand.getReviewTime());
+                            }
+                            state.setCreationTime(DateUtil.printDateAll(new Date()));
+                            state.setModifyTime(DateUtil.printDateAll(new Date()));
+                            filterList.add(state);
+                        });
+                        List<SarBussionessStandState> insList = new ArrayList<>();
+                        List<SarBussionessStandState> updList = new ArrayList<>();
+                        QueryWrapper wrapper = new QueryWrapper();
+                        wrapper.isNull("REVIEW_RESULTS");
+                        wrapper.between("REVIEW_TIME",nextFirst,nextFinByQuery);
+                        List<SarBussionessStandState> stateList = bussionessStandStateService.list(wrapper);
+                        if(!stateList.isEmpty()){
+                            // 差集 (list1 - list2) 新增复审表
+                            List<SarBussionessStandState> distinctByUniqueList = filterList.stream()
+                                    .filter(item -> !stateList.stream()
+                                            .map(SarBussionessStandState::getStandId)
+                                            .collect(Collectors.toList())
+                                            .contains(item.getStandId()))
+                                    .collect(Collectors.toList());
+                            insList.addAll(distinctByUniqueList);
+
+                            // 交集 更新复审表
+                            List<SarBussionessStandState> intersection = filterList.stream()
+                                    .filter(item -> stateList.stream()
+                                            .map(SarBussionessStandState::getStandId)
+                                            .collect(Collectors.toList())
+                                            .contains(item.getStandId()))
+                                    .collect(Collectors.toList());
+                            // jdk8 stream 更新集合批量赋值ID
+                            List<SarBussionessStandState> updSetList = intersection.stream()
+                                    .map(upObj -> stateList.stream()
+                                            .filter(stateQueryObj -> upObj.getStandId().equals(stateQueryObj.getStandId()))
+                                            .findFirst()
+                                            .map(stateQueryObj -> {
+                                                upObj.setId(stateQueryObj.getId());
+                                                upObj.setModifyTime(DateUtil.printDateAll(new Date()));
+                                                return upObj;
+                                            }).orElse(null))
+                                    .collect(Collectors.toList());
+                            updList.addAll(updSetList);
+                        }else {
+                            // 新增复审表
+                            insList.addAll(filterList);
+                        }
+
+                        // 复审表操作逻辑 新增
+                        if(!insList.isEmpty()){
+                            bussionessStandStateService.saveBatch(insList);
+                        }
+
+                        // 复审表操作逻辑 更新
+                        if(!updList.isEmpty()){
+//                            List<SarBussionessStandState> updListResult = updList.stream().peek(p -> p.setModifyTime(DateUtil.printDateAll(new Date()))).collect(Collectors.toList());
+                            bussionessStandStateService.updateBatchById(updList);
+                        }
+                    }
+                    logger.info("月末:"+Thread.currentThread().getName() + " cron=0 0 1 28-31 * ? --- " + new Date()+"---End-01");
+                }else {
+                    logger.info("月末:"+Thread.currentThread().getName() + " cron=0 0 1 28-31 * ? --- " + new Date()+"当前日期不是最后一日---End-01");
+                }
+            }catch(Exception e){
+                logger.info(e.getMessage());
+            }
+        }
+    }
+
+    /** * 判断给定日期是否为月末的一天 * * @param date * @return true:是|false:不是 */
+    public static boolean isLastDayOfMonth(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.set(Calendar.DATE, (calendar.get(Calendar.DATE) + 1));
+        if (calendar.get(Calendar.DAY_OF_MONTH) == 1){
+            return true;
+        }
+        return false;
+    }
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java

@@ -172,13 +172,13 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
                                 case "会签征求意见":
                                     score=Double.valueOf(item.getScore()) * 0.3;
                                     break;
-                                case "技术委员会负责人/起草中心主任审核":
+                                case "技术委员会评审/评审意见修改评审":
                                     score=Double.valueOf(item.getScore()) * 0.4;
                                     break;
-                                case "标准法规工程师复审":
+                                case "标准法规部标准化工程师复审":
                                     score=Double.valueOf(item.getScore()) * 0.15;
                                     break;
-                                case "标准法规部部长审核":
+                                case "标准法规部高级经理审核":
                                     score=Double.valueOf(item.getScore()) * 0.15;
                                     break;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java

@@ -73,6 +73,17 @@ public class TsInstitutionController extends BaseController<TsInstitution> {
         return Result.success(tsUserIPage);
     }
 
+    /**
+     * 查询机构下所有的机构人员
+     * @return ResponseMessage<List<TsUser>>
+     */
+    @ApiOperation("查询机构的人员")
+    @PostMapping("/userUnderInstitution")
+    public ResponseMessage<IPage<TsUser>> userUnderInstitution(TsUser tsUser){
+
+        return Result.success(tsUserService.getAllUsers(tsUser));
+    }
+
     @ApiOperation("导入机构数据")
     @PostMapping("/import")
     public ResponseMessage<Object> importInstitution() throws Exception {

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java

@@ -4,6 +4,8 @@ import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao;
 import com.adc.da.slrs.sarLawsAttrDetailedList.entity.*;
 import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListService;
 import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto;
+import com.adc.da.sys.common.SelectionResult;
+import com.adc.da.sys.dao.DicTypeEODao;
 import com.adc.da.sys.service.IDicTypeEOService;
 import com.adc.da.util.UUIDUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -19,6 +21,7 @@ import org.springframework.util.CollectionUtils;
 import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -253,11 +256,25 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
         return sarLawsAttrDetailedListDao.updateById(sarLawsAttrDetailedList);
     }
 
+
+    @Autowired
+    private DicTypeEODao dicTypeEODao;
+
     @Override
     public Map<String, List<String>> selectTimes(String id) {
         List<StandRegionalTimeDto> standRegionalTimeDto= sarLawsAttrDetailedListDao.selectTimes(id);
-        Map<String, Object> map = iDicTypeEOService.getDicTypeListCode();
+
-        List<Map<String, String>> arr = (List<Map<String, String>>) map.get("COUNTRY");
+//        查询国家地区字典
+        List<SelectionResult> dicTypeList = dicTypeEODao.getDicTypeByDicId("RFRFRFSCXVB");
+        List<Map<String, String>> arr = dicTypeList.stream()
+                .map(item -> {
+                    Map<String, String> map = new HashMap<>();
+                    map.put("label", item.getLabel());
+                    map.put("value", item.getValue());
+                    return map;
+                }).collect(Collectors.toList());
+//        Map<String, Object> map = iDicTypeEOService.getDicTypeListCode();
+//        List<Map<String, String>> arr = (List<Map<String, String>>) map.get("COUNTRY");
         for (StandRegionalTimeDto list1 : standRegionalTimeDto) {
             if (StringUtils.isNotBlank(list1.getCountry()) && list1.getCountry().contains(",")) {
                 String[] split = list1.getCountry().split(",");

adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java

@@ -44,6 +44,19 @@ public class SarModelTreeController extends BaseController<SarModelTree> {
         return Result.success(tsResources);
     }
 
+    @ApiOperation("查询父所有资源")
+    @GetMapping("/listByType")
+    public ResponseMessage<List<SarModelTree>> getAllByType(String type){
+//        List<SarModuleTree> tsResources = iSarModuleTreeService.getAll(null);
+        SarModelTree rootData = new SarModelTree();
+        rootData.setModelType(type);
+        rootData.setDelFlag("1");
+        List<SarModelTree> tsResources = iSarModelTreeService.getAll(rootData);
+        return Result.success(tsResources);
+    }
+
+
+
     @ApiOperation("根据父ID查询子所有资源")
     @GetMapping("/childByList")
     public ResponseMessage<List<SarModelTree>> childByList(SarModelTree parentTree){

adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java

@@ -73,5 +73,25 @@ public class SarModelTree extends BaseEntity {
     @TableField(exist = false)
     private  boolean leaf;
 
+    /**
+     * 模块类型
+     * TRUCK 卡车类
+     * CAR 乘用车类
+     */
+    @TableField("MODEL_TYPE")
+    private String modelType;
+
+    /**
+     * 模块层级父级ID
+     * 为兼容之前的树结构逻辑，此处单独新增父级ID关联关系
+     */
+    @TableField("MODEL_PID")
+    private String modelPid;
+
+    /**
+     * 模块数据层级关系
+     */
+    @TableField("MODEL_LEVEL")
+    private int modelLevel;
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java

@@ -5,6 +5,7 @@ import com.adc.da.slrs.sarModelTree.dao.SarModelTreeDao;
 import com.adc.da.slrs.sarModelTree.service.ISarModelTreeService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -30,6 +31,10 @@ public class SarModelTreeServiceImpl extends ServiceImpl<SarModelTreeDao, SarMod
     public List<SarModelTree> getAll(SarModelTree sarModelTree) {
         QueryWrapper<SarModelTree> tsResourceQueryWrapper=new QueryWrapper<>();
         tsResourceQueryWrapper.isNull("PID");
+        if(sarModelTree!=null && StringUtils.isNotBlank(sarModelTree.getModelType())){
+            tsResourceQueryWrapper.eq("MODEL_TYPE",sarModelTree.getModelType());
+        }
+        tsResourceQueryWrapper.eq("DEL_FLAG","1");
         List<SarModelTree> list = this.baseMapper.selectList(tsResourceQueryWrapper);
 //        for(SarModelTree tree:list){
 //            tree.setChildren(recursionGetChildren((tree)));
@@ -59,6 +64,10 @@ public class SarModelTreeServiceImpl extends ServiceImpl<SarModelTreeDao, SarMod
         sarMenuQueryWrapper.orderByAsc("SORT");
 //        sarMenuQueryWrapper.in("PID",parent.getId());
         sarMenuQueryWrapper.eq("PID",parent.getId());
+        if(parent!=null && StringUtils.isNotBlank(parent.getModelType())){
+            sarMenuQueryWrapper.eq("MODEL_TYPE",parent.getModelType());
+        }
+        sarMenuQueryWrapper.eq("DEL_FLAG","1");
         List<SarModelTree> children=this.baseMapper.selectList(sarMenuQueryWrapper);
 //        for(SarModelTree sarMenu:children){
 //            sarMenu.setChildren(recursionGetChildren((sarMenu)));

adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java

@@ -20,7 +20,7 @@ import java.util.List;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author zyl
@@ -65,7 +65,7 @@ public class TsResource extends BaseEntity {
     @ApiModelProperty(value = "排序序号")
     @TableField("DISPLAY_SEQ")
     private Integer displaySeq;
-    
+
 
     @ApiModelProperty(value = "是否有效")
     @TableField("VALID_FLAG")
@@ -100,4 +100,7 @@ public class TsResource extends BaseEntity {
     @TableField(exist=false)
     private String userId;
 
+    @TableField(exist = false)
+    private String isFlow;
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java

@@ -224,6 +224,15 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
             TsResourceQueryWrapper.like("PARENT_IDS",resource.getId());
             TsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ");
             List<TsResource> children=dao.selectList(TsResourceQueryWrapper);
+
+            /**
+             * 入库流程去除我的收藏 flow
+             */
+            if ( tsResource.getIsFlow()!=null && "flow".equals(tsResource.getIsFlow())){
+                children=children.stream()
+                        .filter(item->!"我的收藏".equals(item.getMenuName()))
+                        .collect(Collectors.toList());
+            }
             resource.setChildren(recursionGetListChildrenStand((resource),(children)));
         }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java

@@ -53,6 +53,14 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
         }
     }
 
+    @ApiOperation(value = "分解单查询")
+    @GetMapping("/findItemById")
+    public ResponseMessage findItemById( @RequestParam("type") String type,@RequestParam("ids") String ids){
+        String[] Sids=ids.split(",");
+        List<SarStandItemsDto> ItemDto = ServiceImpl.findItemById(type,Sids);
+        return Result.success("200",ItemDto);
+    }
+
     @ApiOperation(value = "项目评估流程分解单查询")
     @GetMapping("/workflowFindItems")
     public ResponseMessage workflowFindItems( @RequestParam("ids") String ids,@RequestParam("types") String types){

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java

@@ -63,6 +63,8 @@ public interface SarStandItemsDao extends BaseMapper<SarStandItems> {
 
     List<SarStandItemsDto> selectAllItemsByIds(@Param("type") String type,@Param("ids") String[] ids);
 
+    List<SarStandItemsDto> findItemById(@Param("type") String type,@Param("ids") String[] ids);
+
     StandsTimeDto selectStandTime(String standId);
 
     List<StandsTimeDto> selectStandTimeAll();

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java

@@ -220,6 +220,43 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
         }
     }
 
+    public List<SarStandItemsDto> findItemById(String type,String[] ids){
+        List<SarStandItemsDto> list=dao.findItemById(type,ids);
+        List<SarStandItemsDto> res=new ArrayList<>();
+        List<SarStandItemsDto> chinese=new ArrayList<>();
+        if (null == list || list.isEmpty()){
+            return list;
+        }else {
+            List<Integer> integerList=new ArrayList<>();
+            Map<Integer,List<SarStandItemsDto>> map=new HashMap<>();
+            list.forEach(sarStandItemsDto -> {
+                int a= sarStandItemsDto.getItemsNum().indexOf(".");
+                String mark=sarStandItemsDto.getItemsNum();
+                if (a>0){
+                    mark=mark.substring(0,a);
+                }
+                try {
+                    if (null != map.get(Integer.valueOf(mark))) {
+                        map.get(Integer.valueOf(mark)).add(sarStandItemsDto);
+                    } else {
+                        integerList.add(Integer.valueOf(mark));
+                        List<SarStandItemsDto> middle = new ArrayList<>();
+                        middle.add(sarStandItemsDto);
+                        map.put(Integer.valueOf(mark), middle);
+                    }
+                }catch (Exception e){
+                    chinese.add(sarStandItemsDto);
+                }
+            });
+            Collections.sort(integerList);
+            integerList.forEach(integer -> {
+                res.addAll(map.get(integer));
+            });
+            res.addAll(chinese);
+            return res;
+        }
+    }
+
 
     public List<SarStandItems> querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
         //排序

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java

@@ -29,4 +29,6 @@ public interface SarStandMenuDao extends BaseMapper<SarStandMenu> {
 
     List<SarStandMenu> selectAllMenuByStandId(SarStandMenu sarStandMenuEO);
 
+    List<SarStandMenu> getMenuByStandId(SarStandMenu sarStandMenu);
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java

@@ -15,7 +15,7 @@ import org.springframework.data.annotation.Transient;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author super_liu
@@ -58,4 +58,7 @@ public class SarStandMenu extends BaseEntity {
     private List<String> menuIds;
 
 
+    @TableField(exist = false)
+    private String menuName;
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java

@@ -325,35 +325,43 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
         List<String> managementHostList = new ArrayList<>();
         List<String> developmentHostList = new ArrayList<>();
         List<String> categoryList = new ArrayList<>();
+        List<String> statusList=new ArrayList<>();
         for(SarStandProjectLibrary sarStandProjectLibrary1 : list){
-            if(!managementHostList.contains(sarStandProjectLibrary1.getManagementHostName())){
+            if(null!= sarStandProjectLibrary1.getManagementHostName()&& !"".equals(sarStandProjectLibrary1.getManagementHostName()) && !managementHostList.contains(sarStandProjectLibrary1.getManagementHostName())){
                 managementHostList.add(sarStandProjectLibrary1.getManagementHostName());
             }
-            if(!developmentHostList.contains(sarStandProjectLibrary1.getDevelopmentHostName())){
+            if(null!= sarStandProjectLibrary1.getDevelopmentHostName()&& !"".equals(sarStandProjectLibrary1.getDevelopmentHostName()) && !developmentHostList.contains(sarStandProjectLibrary1.getDevelopmentHostName())){
                 developmentHostList.add(sarStandProjectLibrary1.getDevelopmentHostName());
             }
-            if(!categoryList.contains(sarStandProjectLibrary1.getCategoryName())){
+            if(null!= sarStandProjectLibrary1.getCategoryName()&& !"".equals(sarStandProjectLibrary1.getCategoryName()) && !categoryList.contains(sarStandProjectLibrary1.getCategoryName())){
                 categoryList.add(sarStandProjectLibrary1.getCategoryName());
             }
+            if (null!= sarStandProjectLibrary1.getProjectStatus()&& !"".equals(sarStandProjectLibrary1.getProjectStatus()) && !statusList.contains(sarStandProjectLibrary1.getProjectStatus())){
+                statusList.add(sarStandProjectLibrary1.getProjectStatus());
+            }
         }
         QuerySelectRspDTO querySelectRspDTO = QuerySelectRspDTO.builder()
                 .managementHostList(managementHostList)
                 .developmentHostList(developmentHostList)
                 .categoryList(categoryList)
+                .statusList(statusList)
                 .build();
         return Result.success(querySelectRspDTO);
     }
     //标准评估流程 查询项目群接口
     @GetMapping("/queryProjectGroup")
     @ApiOperation("查询项目群")
-    public ResponseMessage queryProjectGroup(SarStandProjectLibrary sarStandProjectLibrary){
+    public ResponseMessage queryProjectGroup(@RequestParam(defaultValue = "1", value = "current")int current,
-        return Result.success( sarStandProjectLibraryService.queryProjectGroup(sarStandProjectLibrary));
+                                             @RequestParam(defaultValue = "10", value = "PageSize") int pageSize,
+                                             SarStandProjectLibrary sarStandProjectLibrary){
+        return Result.success( sarStandProjectLibraryService.queryProjectGroup(current,pageSize,sarStandProjectLibrary));
     }
     //标准评估流程根据项目群查项目接口
     @GetMapping("/queryProjects")
     @ApiOperation("查询项目群下的项目")
-    public ResponseMessage queryProjects(SarStandProjectLibrary sarStandProjectLibrary){
+    public ResponseMessage queryProjects(@RequestParam(defaultValue = "1", value = "current")int current,
-        return Result.success( sarStandProjectLibraryService.queryProjects(sarStandProjectLibrary));
+                                         @RequestParam(defaultValue = "10", value = "PageSize") int pageSize,SarStandProjectLibrary sarStandProjectLibrary){
+        return Result.success( sarStandProjectLibraryService.queryProjects(current,pageSize,sarStandProjectLibrary));
     }
 
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java

@@ -33,7 +33,9 @@ public interface SarStandProjectLibraryDao extends BaseMapper<SarStandProjectLib
         void deleteByProjectId(@Param("projectId")String projectId);
 
         List<String> selectListByids(@Param("ids") List<String> ids);
-        List<SarStandProjectLibrary> queryProjectGroup(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
+        List<SarStandProjectLibrary> queryProjectGroup(@Param("current")int current,@Param("size")int size,@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
+        Integer queryProjectGroupCount(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
 
-        List<SarStandProjectLibrary> queryProjects(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary,@Param("groups")List<String> strings);
+        List<SarStandProjectLibrary> queryProjects(@Param("current")int current,@Param("size")int size,@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary,@Param("groups")List<String> strings);
+        Integer queryProjectsCount(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary,@Param("groups")List<String> strings);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/QuerySelectRspDTO.java

@@ -14,4 +14,6 @@ public class QuerySelectRspDTO {
     private List<String> developmentHostList;
 
     private List<String> categoryList;
+
+    private List<String> statusList;
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java

@@ -29,8 +29,8 @@ public interface SarStandProjectLibraryService {
     void batchInsertAdd(@Param("ids") List<StandProjectRelationDto> list);
     List<StandAttrInfoDto> exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto,String standId);
     public Head AnalysisJsonAndStorage(String jsonStr);
-    public List<SarStandProjectLibrary> queryProjectGroup(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
+    public IPage<SarStandProjectLibrary> queryProjectGroup(@Param("current")int current,@Param("size")int size, @Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
 
-    public List<SarStandProjectLibrary> queryProjects(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
+    public IPage<SarStandProjectLibrary> queryProjects(@Param("current")int current,@Param("size")int size, @Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java

@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -127,12 +128,19 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
     }
 
     @Override
-    public List<SarStandProjectLibrary> queryProjectGroup(SarStandProjectLibrary sarStandProjectLibrary) {
+    public IPage<SarStandProjectLibrary> queryProjectGroup(int current,int size,SarStandProjectLibrary sarStandProjectLibrary) {
-        return sarStandProjectLibraryDao.queryProjectGroup(sarStandProjectLibrary);
+        List<SarStandProjectLibrary> sarStandProjectLibraries=sarStandProjectLibraryDao.queryProjectGroup(current,size,sarStandProjectLibrary);
+        Integer total=sarStandProjectLibraryDao.queryProjectGroupCount(sarStandProjectLibrary);
+        Page<SarStandProjectLibrary> page=new Page<>();
+        page.setRecords(sarStandProjectLibraries);
+        page.setTotal(total);
+        page.setCurrent(current);
+        page.setSize(size);
+        return page;
     }
 
     @Override
-    public List<SarStandProjectLibrary> queryProjects(SarStandProjectLibrary sarStandProjectLibrary) {
+    public IPage<SarStandProjectLibrary> queryProjects(int current,int size, SarStandProjectLibrary sarStandProjectLibrary) {
         List<String> ids=new ArrayList<>();
         if (null!=sarStandProjectLibrary.getProjectGroup() && !"".equals(sarStandProjectLibrary.getProjectGroup())){
             if (sarStandProjectLibrary.getProjectGroup().contains(",")){
@@ -141,7 +149,15 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
                 ids.add(sarStandProjectLibrary.getProjectGroup());
             }
         }
-        return sarStandProjectLibraryDao.queryProjects(sarStandProjectLibrary,ids);
+        IPage<SarStandProjectLibrary> sarStandProjectLibraryIPage=new Page<>();
+        List<SarStandProjectLibrary> sarStandProjectLibraries=sarStandProjectLibraryDao.queryProjects(current,size,sarStandProjectLibrary,ids);
+        Integer total=sarStandProjectLibraryDao.queryProjectsCount(sarStandProjectLibrary,ids);
+        sarStandProjectLibraryIPage.setTotal(total);
+        sarStandProjectLibraryIPage.setCurrent(current);
+        sarStandProjectLibraryIPage.setSize(size);
+        sarStandProjectLibraryIPage.setRecords(sarStandProjectLibraries);
+
+        return sarStandProjectLibraryIPage;
     }
 
     @Override

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java

@@ -14,6 +14,8 @@ import com.adc.da.http.Result;
 import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
 import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
 import com.adc.da.slrs.sarLawsInfo.service.ISarLawsInfoService;
+import com.adc.da.slrs.sarStandMenu.dao.SarStandMenuDao;
+import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu;
 import com.adc.da.slrs.sarStandardsInfo.entity.*;
 import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService;
 import com.adc.da.util.LoginUserUtil;
@@ -553,6 +555,46 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
 
     }
 
+    @ApiOperation(value = "在入库流程中配置单个标准的 体系目录 体系目录可以是多个")
+    @PostMapping("/saveStandardsMenuForFlow")
+    public ResponseMessage saveStandardsMenuForFlow(@RequestBody SarStandardsInfoEOPage standardsInfoEO) throws Exception {
+        boolean flag = false;
+        for (String id : Arrays.asList(standardsInfoEO.getMenuIds().split(","))) {
+            standardsInfoEO.setMenuId(id);
+
+            try {
+                flag = sarStandardsInfoEOService.updateStandardsMenu(standardsInfoEO);
+            }catch (NullPointerException e){
+                flag = sarStandardsInfoEOService.updateStandInfo(standardsInfoEO);
+            }
+
+            if (!flag){
+                break;
+            }
+        }
+
+
+
+        if (flag){
+            return Result.success("200","配置成功",true);
+        }
+        return Result.error("-1","配置失败");
+
+    }
+
+    @Autowired
+    SarStandMenuDao sarStandMenuDao;
+    @ApiOperation(value = "查询标准所在的 体系目录")
+    @GetMapping("/getStandMenuId")
+    public ResponseMessage<List<SarStandMenu>> getStandMenuId(SarStandMenu getStandId){
+
+        List<SarStandMenu> sarStandMenus = sarStandMenuDao.getMenuByStandId(getStandId);
+
+        return Result.success(sarStandMenus);
+
+    }
+
+
     @ApiOperation(value = "|SarStandardsInfoEO|详情页面查询相近标准")
     @GetMapping("/selectCloseStand")
     //@RequiresPermissions("lawss:sarStandardsInfo:list")

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java

@@ -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)

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java

@@ -103,4 +103,9 @@ public class SarStandardsInfoEOPage extends BasePage {
      *   日期范围查询发布日期结束
      */
     private String endIssueTime;
+
+    /**
+     *   标准添加到体系中的id多个
+     */
+    private String menuIds;
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -814,13 +814,16 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         sarStandardsInfoEO.setCreationTime(new Date());
         sarStandardsInfoEO.setModifyTime(new Date());
         //根据新建标准所在目录，确定此处是否需要在标准目录关联表中插入数据
-        if (StringUtils.isNotEmpty(sarStandardsInfoEO.getMenuId())) {
+        if (StringUtils.isNotEmpty(sarStandardsInfoEO.getMenuIds())) {
-            SarStandMenu sarStandMenuEO = new SarStandMenu();
+
-            sarStandMenuEO.setStandId(sarStandardsInfoEO.getId());
+            for (String menuId : sarStandardsInfoEO.getMenuIds().split(",")) {
-            sarStandMenuEO.setMenuId(sarStandardsInfoEO.getMenuId());
+                SarStandMenu sarStandMenuEO = new SarStandMenu();
-            sarStandMenuEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue());
+                sarStandMenuEO.setStandId(sarStandardsInfoEO.getId());
-            sarStandMenuEO.setId(UUIDUtils.randomUUID20());
+                sarStandMenuEO.setMenuId(menuId);
-            sarStandMenuEODao.insert(sarStandMenuEO);
+                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);
         //修改标准过程中，重新修改代替标准号对应的标准的被代替标准号

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java

@@ -49,7 +49,11 @@ public interface TsUserDao extends BaseMapper<TsUser> {
      */
     List<TsUser> getUserAndPositionPage(@Param("start")Integer start, @Param("end")Integer end,@Param("TsUser") TsUser tsUser);
 
+    List<TsUser> userUnderInstitution(@Param("start")Integer start, @Param("end")Integer end,@Param("TsUser") TsUser tsUser,@Param("ids") List<String> ids);
+
     Integer getUserAndPositionCount(@Param("TsUser") TsUser tsUser);
+
+    Integer userUnderInstitutionCount(@Param("TsUser") TsUser tsUser,@Param("ids") List<String> ids);
     /**
      * 通过岗位Id列表查询用户ID列表
      * @param positionIds：岗位ID列表

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java

@@ -83,4 +83,6 @@ public interface ITsUserService extends IService<TsUser> {
     List<UpDTO> selectByName(String name);
 
     List<UpDTO> selectNameById(List<String> strings,String type);
+
+    IPage<TsUser> getAllUsers(TsUser tsUser);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java

@@ -3,6 +3,8 @@ package com.adc.da.slrs.sarUser.service.impl;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.login.util.UserUtils;
+import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
+import com.adc.da.slrs.sarInstitution.service.ITsInstitutionService;
 import com.adc.da.slrs.sarMenu.entity.SarMenu;
 import com.adc.da.slrs.sarMenu.service.ISarMenuService;
 import com.adc.da.slrs.sarPosition.dao.TsPositionDao;
@@ -47,6 +49,8 @@ public class TsUserServiceImpl extends ServiceImpl<TsUserDao, TsUser> implements
     @Autowired
     private TsUserDao tsUserDao;
     @Autowired
+    private ITsUserService tsUserService;
+    @Autowired
     private ITsPositionService tsPositionService;
     @Autowired
     @Lazy
@@ -59,6 +63,8 @@ public class TsUserServiceImpl extends ServiceImpl<TsUserDao, TsUser> implements
     private SyncUserService syncUserService;
     @Autowired
     private TsPositionDao tsPositionDao;
+    @Autowired
+    private ITsInstitutionService tsInstitutionService;
 
 
     public void deleteUser(){
@@ -364,4 +370,40 @@ public class TsUserServiceImpl extends ServiceImpl<TsUserDao, TsUser> implements
         });
         return result;
     }
+
+    @Override
+    public IPage<TsUser> getAllUsers(TsUser tsUser) {
+        List<String> ids=new ArrayList<>();
+        ids.add(tsUser.getInstitutionId());
+        List<String> middle=new ArrayList<>();
+        middle.addAll(ids);
+        boolean flag=true;
+        while (flag){
+            QueryWrapper<TsInstitution> queryWrapper=new QueryWrapper<>();
+            queryWrapper.in("parent_id",middle);
+            List<TsInstitution> tsmiddle=tsInstitutionService.list(queryWrapper);
+            if (tsmiddle.size()>0){
+                tsmiddle.forEach(tsInstitution -> {
+                    middle.add(tsInstitution.getId());
+                });
+                middle.removeAll(ids);
+                ids.addAll(middle);
+            }else {
+                tsmiddle.forEach(tsInstitution -> {
+                    middle.add(tsInstitution.getId());
+                });
+                middle.removeAll(ids);
+                ids.addAll(middle);
+                flag=false;
+            }
+        }
+        Page<TsUser> tsUserPage = new Page<>();
+        tsUserPage.setCurrent(tsUser.getCurrent());
+        tsUserPage.setSize(tsUser.getSize());
+        tsUserPage.setRecords(tsUserDao.userUnderInstitution((tsUser.getCurrent()-1)*tsUser.getSize(),tsUser.getSize(),tsUser,ids));
+        tsUserPage.setTotal(tsUserDao.userUnderInstitutionCount(tsUser,ids));
+        return tsUserPage;
+    }
+
+
 }

adc-da-slrs/src/main/java/com/adc/da/utils/util/DateUtil.java

@@ -11,6 +11,93 @@ import java.util.*;
  */
 public class DateUtil {
 
+    public static String addDay(String date, Integer dayInt) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date today = null;
+        try {
+            today = sdf.parse(date);
+        } catch (ParseException e) {
+        }
+        String endDate = sdf.format(today);//当前日期
+        Calendar theCa = Calendar.getInstance();
+        theCa.setTime(today);
+        theCa.add(theCa.DATE, +dayInt);//最后一个数字30可改，30天的意思
+        Date start = theCa.getTime();
+        String startDate = sdf.format(start);//三十天之前日期
+
+        return startDate;
+    }
+
+    public static Date nextMonthFirstDate() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DAY_OF_MONTH, 1);
+        calendar.add(Calendar.MONTH, 1);
+        return calendar.getTime();
+    }
+
+    public static Date printToDate(String date) {
+        Date date1 = null;
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        try {
+            date1 = sdf.parse(date);
+        }catch (Exception e){
+            e.getMessage();
+        }
+        return date1;
+    }
+
+    public static String printDateAll(Date date) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.format(date);
+    }
+
+    public static String printDate(Date date) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(date);
+    }
+
+    public static String firstOneDay(String date) {
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date today = null;
+        String startDate = "";
+        try {
+            today = sdf.parse(date);
+            String endDate = sdf.format(today);//当前日期
+            Calendar theCa = Calendar.getInstance();
+            theCa.setTime(today);
+            theCa.add(Calendar.MONTH, 0);
+            theCa.set(Calendar.DAY_OF_MONTH, 1);
+            Date start = theCa.getTime();
+            startDate = sdf.format(start);
+        } catch (ParseException e) {
+        }
+
+
+        return startDate;
+    }
+
+    public static String finOneDay(String date) {
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date today = null;
+        String startDate = "";
+        try {
+            today = sdf.parse(date);
+            String endDate = sdf.format(today);//当前日期
+            Calendar theCa = Calendar.getInstance();
+            theCa.setTime(today);
+            theCa.set(Calendar.DAY_OF_MONTH, 1);
+            theCa.set(Calendar.DATE, theCa.getActualMaximum(Calendar.DATE));
+            Date start = theCa.getTime();
+            startDate = sdf.format(start);
+        } catch (ParseException e) {
+        }
+
+
+        return startDate;
+    }
+
     /**
      * 取起始时间到结束时间 所有的时间
      * @param startTime
@@ -115,6 +202,12 @@ public class DateUtil {
 
 
     public static void main(String[] args) {
+        System.out.println(printDate(new Date()));
+        System.out.println(firstOneDay(printDate(new Date())));
+        System.out.println(finOneDay(printDate(new Date())));
+        System.out.println(addDay(finOneDay(printDate(new Date())),2));
+        System.out.println(printDate(nextMonthFirstDate()));
+        System.out.println(finOneDay(printDate(nextMonthFirstDate())));
         String utcTime = "2021-04-15T01:43:54.296Z";
         String time = formatStrUTCToDateStr("2021-04-15T01:43:54.296Z");
         System.out.println("utcTime 转换前：" + utcTime);

adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml

@@ -757,6 +757,20 @@
         </if>
         order by ITEMS_NUM
     </select>
+
+    <select id="findItemById" resultType="com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto">
+        select ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as responsibleEngineer,XCXSSRQ as xcxssrq,ZCCSSRQ as zccssrq ,read_content as technicalRequir ,compared_with_previous as changePoint
+        ,TERMS_CONDITIONS as termsConditions
+        from SAR_STAND_ITEMS
+        where FILE_TYPE=#{type}
+        <if test="ids != null">
+            and ID in
+            <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        order by ITEMS_NUM
+    </select>
     <select id="selectStandTime" resultType="com.adc.da.slrs.sarStandItems.entity.StandsTimeDto">
         select STAND_ID,XCXSSRQ,ZCCSSRQ
         from sar_stand_attr_info
@@ -788,7 +802,8 @@
         WHERE b.VALID_FLAG = 0
     </select>
     <select id="getFileType" resultType="java.lang.String">
-       SELECT FILE_type from sar_stand_items WHERE STAND_ID = #{standId} GROUP BY FILE_TYPE
+      <!-- SELECT FILE_type from sar_stand_items WHERE STAND_ID = #{standId} GROUP BY FILE_TYPE -->
+       SELECT FILE_type from sar_file_split_info WHERE STAND_ID = #{standId} AND VALID_FLAG = '0' GROUP BY FILE_TYPE
     </select>
 
 </mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml

@@ -82,5 +82,21 @@
         from SAR_STAND_MENU
         where stand_id = #{standId} and valid_flag=0
     </select>
+    <select id="getMenuByStandId" resultType="com.adc.da.slrs.sarStandMenu.entity.SarStandMenu">
+                SELECT
+        	SAR_STAND_MENU.valid_flag as validFlag,
+        	menu_id as menuId,
+        	stand_id as standId,
+        	SAR_STAND_MENU.id as id,
+        	MENU_NAME as menuName
+        FROM
+        	SAR_STAND_MENU
+        LEFT JOIN ts_resource ON SAR_STAND_MENU.MENU_ID = ts_resource.ID
+        WHERE
+        	stand_id =  #{standId}
+        AND SAR_STAND_MENU.VALID_FLAG = 0
+
+    </select>
+
 
 </mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml

@@ -22,6 +22,7 @@
         <result column="stand_year" property="standYear" />
         <result column="text_status_buss" property="textStatusBuss" />
         <result column="text_status_buss_show" property="textStatusBussShow"/>
+        <result column="DTQBBHBUSS" property="DTQBBHBUSS"/>
     </resultMap>
 
     <resultMap id="BaseResultMapExcel" type="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand" >
@@ -366,6 +367,27 @@
         </if>
     </select>
 
+    <select id="queryByBussStateSync" resultMap="BaseResultMap"
+            parameterType="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand">
+        SELECT
+            <include refid="Base_Column_List"/>,
+            DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 5 YEAR),INTERVAL 1 MONTH) AS reviewTime
+        FROM sar_bussioness_stand
+        WHERE stand_sort = 'Q/QCBFC'
+        AND ISSUE_TIME IS NOT NULL
+        AND DATE_FORMAT(DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 5 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d')
+        BETWEEN DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_ADD(DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d'),INTERVAL 1 DAY)
+        UNION
+        SELECT
+            <include refid="Base_Column_List"/>,
+            DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 3 YEAR),INTERVAL 1 MONTH) AS reviewTime
+        FROM sar_bussioness_stand
+        WHERE stand_sort != 'Q/QCBFC'
+        AND ISSUE_TIME IS NOT NULL
+        AND DATE_FORMAT(DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 3 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d')
+        BETWEEN DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_ADD(DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d'),INTERVAL 1 DAY)
+    </select>
+
 
     <!-- 分页查询条件 -->
     <sql id="standSort_in">
@@ -672,7 +694,7 @@
         select * from
         (select tmp_tb.*  from
         (select
-        dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow,
+        dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow,SAR_BUSS_STAND_ATTR_INFO.DTQBBHBUSS,
         <include refid="Base_Column_List_show" />
         from SAR_BUSSIONESS_STAND
         <include refid="SarBussionInfo_Where_Clause"/>

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.sarBussionessStandState.dao.SarBussionessStandStateDao">
+
+    <resultMap id="BaseResultMap" type="com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState" >
+    </resultMap>
+
+    <sql id="Base_Column_List" >
+        ID,
+        STAND_ID,
+        STAND_NAME,
+        STAND_CODE,
+        REVIEW_TIME,
+        ISSUE_TIME,
+        REVIEW_RESULTS,
+        REVIEW_PROCESS_NUM,
+        CREATION_TIME,
+        MODIFY_TIME,
+        VALID_FLAG,
+        PARAM1,
+        PARAM2
+    </sql>
+
+    <sql id="SarBussionInfoRole_Where_Clause_Review_Results_N">
+        where REVIEW_RESULTS IS NULL
+        AND DATE_FORMAT(REVIEW_TIME, '%Y-%m-%d') between DATE_FORMAT(current_timestamp(), '%Y-%m-%d') AND DATE_ADD(CURDATE(), INTERVAL 30 DAY)
+        <trim suffixOverrides="," >
+            <if test="standCode != null and standCode != '' " >
+                and STAND_CODE like  concat(concat('%',#{standCode}),'%')
+            </if>
+            <if test="reviewTimeStart != null and reviewTimeStart != '' and reviewTimeEnd != null and reviewTimeEnd != ''">
+                and DATE_FORMAT(REVIEW_TIME, '%Y-%m-%d') between DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d')
+            </if>
+            <if test="reviewTimeStart != null and reviewTimeStart != '' and reviewTimeEnd == null and reviewTimeEnd == ''">
+                and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%d') &gt;= DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d')
+            </if>
+            <if test="reviewTimeStart == null and reviewTimeStart == '' and reviewTimeEnd != null and reviewTimeEnd != ''">
+                and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%d') &lt;= DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d')
+            </if>
+            <if test="issueTimeStart != null and issueTimeStart != '' and issueTimeEnd != null and issueTimeEnd != ''">
+                and DATE_FORMAT(REVIEW_TIME, '%Y-%m-%d') between DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d')
+            </if>
+            <if test="issueTimeStart != null and issueTimeStart != '' and issueTimeEnd == null and issueTimeEnd == ''">
+                and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%d') &gt;= DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d')
+            </if>
+            <if test="issueTimeStart == null and issueTimeStart == '' and issueTimeEnd != null and issueTimeEnd != ''">
+                and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%d') &lt;= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d')
+            </if>
+        </trim>
+    </sql>
+    <sql id="SarBussionInfoRole_Where_Clause_Review_Results">
+        where REVIEW_RESULTS IS NOT NULL
+        <trim suffixOverrides="," >
+            <if test="standCode != null and standCode != '' " >
+                and STAND_CODE like  concat(concat('%',#{standCode}),'%')
+            </if>
+            <if test="reviewTimeStart != null and reviewTimeStart != '' and reviewTimeEnd != null and reviewTimeEnd != ''">
+                and DATE_FORMAT(REVIEW_TIME, '%Y-%m-%d') between DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d')
+            </if>
+            <if test="reviewTimeStart != null and reviewTimeStart != '' and reviewTimeEnd == null and reviewTimeEnd == ''">
+                and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%d') &gt;= DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d')
+            </if>
+            <if test="reviewTimeStart == null and reviewTimeStart == '' and reviewTimeEnd != null and reviewTimeEnd != ''">
+                and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%d') &lt;= DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d')
+            </if>
+            <if test="issueTimeStart != null and issueTimeStart != '' and issueTimeEnd != null and issueTimeEnd != ''">
+                and DATE_FORMAT(REVIEW_TIME, '%Y-%m-%d') between DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d')
+            </if>
+            <if test="issueTimeStart != null and issueTimeStart != '' and issueTimeEnd == null and issueTimeEnd == ''">
+                and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%d') &gt;= DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d')
+            </if>
+            <if test="issueTimeStart == null and issueTimeStart == '' and issueTimeEnd != null and issueTimeEnd != ''">
+                and DATE_FORMAT(REVIEW_TIME,'%Y-%m-%d') &lt;= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d')
+            </if>
+        </trim>
+    </sql>
+
+    <!-- 分页查询条件当页数据 -->
+    <select id="getBussionessStandStatePage" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage">
+        SELECT A.* FROM (
+        select <include refid="Base_Column_List" />
+        from sar_bussioness_stand_state
+        <include refid="SarBussionInfoRole_Where_Clause_Review_Results_N"/>
+        union
+        select <include refid="Base_Column_List" />
+        from sar_bussioness_stand_state
+        <include refid="SarBussionInfoRole_Where_Clause_Review_Results"/>
+        ORDER BY
+        REVIEW_RESULTS ASC,
+        REVIEW_TIME DESC,
+        ISSUE_TIME DESC
+        ) A
+        limit ${pager.startIndex-1},${pageSize}
+    </select>
+
+    <select id="getBussionessStandStateCount" resultType="java.lang.Integer" parameterType="com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage">
+        select count(1) from (
+        select id from sar_bussioness_stand_state
+        <include refid="SarBussionInfoRole_Where_Clause_Review_Results_N"/>
+        union
+        select id from sar_bussioness_stand_state
+        <include refid="SarBussionInfoRole_Where_Clause_Review_Results"/>
+        ) a
+    </select>
+</mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml

@@ -381,6 +381,24 @@
         <if test="sarStandProjectLibrary.categoryName != null and sarStandProjectLibrary.categoryName != ''">
           and  sar_stand_project_library.category_name=#{sarStandProjectLibrary.categoryName}
         </if>
+        limit  ${(current-1) * size},${size}
+    </select>
+    <select id="queryProjectGroupCount"
+            resultType="java.lang.Integer">
+        select count(a.project_group) from (
+        select distinct
+        sar_stand_project_library.project_group,sar_stand_project_library.management_host_name,sar_stand_project_library.category_name,sar_stand_project_library.development_host_name
+        from sar_stand_project_library
+        where 1=1
+        <if test="sarStandProjectLibrary.managementHostName != null and sarStandProjectLibrary.managementHostName != ''">
+            and sar_stand_project_library.management_host_name=#{sarStandProjectLibrary.managementHostName}
+        </if>
+        <if test="sarStandProjectLibrary.developmentHostName != null and sarStandProjectLibrary.developmentHostName != ''">
+            and sar_stand_project_library.development_host_name=#{sarStandProjectLibrary.developmentHostName}
+        </if>
+        <if test="sarStandProjectLibrary.categoryName != null and sarStandProjectLibrary.categoryName != ''">
+            and sar_stand_project_library.category_name=#{sarStandProjectLibrary.categoryName}
+        </if> )a
     </select>
     <select id="queryProjects"
             resultType="com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary">
@@ -405,5 +423,31 @@
             #{item}
         </foreach>
         </if>
+        limit  ${(current-1) * size},${size}
+    </select>
+
+    <select id="queryProjectsCount"
+            resultType="java.lang.Integer">
+        select count(sar_stand_project_library.id) from sar_stand_project_library
+        left join ts_user on ts_user.USID = sar_stand_project_library.project_manager
+        where 1=1
+        <if test="sarStandProjectLibrary.managementHostName != null and sarStandProjectLibrary.managementHostName != ''">
+            and sar_stand_project_library.management_host_name=#{sarStandProjectLibrary.managementHostName}
+        </if>
+        <if test="sarStandProjectLibrary.developmentHostName != null and sarStandProjectLibrary.developmentHostName != ''">
+            and sar_stand_project_library.development_host_name=#{sarStandProjectLibrary.developmentHostName}
+        </if>
+        <if test="sarStandProjectLibrary.categoryName != null and sarStandProjectLibrary.categoryName != ''">
+            and sar_stand_project_library.category_name=#{sarStandProjectLibrary.categoryName}
+        </if>
+        <if test="sarStandProjectLibrary.projectStatus != null and sarStandProjectLibrary.projectStatus != ''">
+            and sar_stand_project_library.project_status=#{sarStandProjectLibrary.projectStatus}
+        </if>
+        <if test="null != groups and groups.size()>0">
+        and sar_stand_project_library.project_group in
+        <foreach collection="groups" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        </if>
     </select>
 </mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml

@@ -48,6 +48,49 @@
         limit #{start},#{end}
     </select>
 
+    <select id="userUnderInstitution" parameterType="com.adc.da.slrs.sarUser.entity.TsUser" resultMap="UserPosition">
+        select u.*,p.id p_id,p.name p_name from ts_user u
+        left join ts_user_position up
+        on u.usid=up.user_id
+        left join ts_position p
+        on up.position_id=p.id
+        where 1=1
+        <if test="TsUser.uname != null and TsUser.uname != '' ">
+            and u.uname like concat('%',#{TsUser.uname},'%')
+        </if>
+        <if test="TsUser.email != null and TsUser.email != '' ">
+            and u.email like concat('%',#{TsUser.email},'%')
+        </if>
+        <if test=" null != ids and ids.size()> 0">
+            and INSTITUTION_ID in
+            <foreach item="id" collection="ids" open="(" separator="," close=")" index="index">
+                #{id}
+            </foreach>
+        </if>
+        limit #{start},#{end}
+    </select>
+
+    <select id="userUnderInstitutionCount" resultType="java.lang.Integer">
+        select count(u.USID) from ts_user u
+        left join ts_user_position up
+        on u.usid=up.user_id
+        left join ts_position p
+        on up.position_id=p.id
+        where 1=1
+        <if test="TsUser.uname != null and TsUser.uname != '' ">
+            and u.uname like concat('%',#{TsUser.uname},'%')
+        </if>
+        <if test="TsUser.email != null and TsUser.email != '' ">
+            and u.email like concat('%',#{TsUser.email},'%')
+        </if>
+        <if test=" null != ids and ids.size()> 0">
+            and INSTITUTION_ID in
+            <foreach item="id" collection="ids" open="(" separator="," close=")" index="index">
+                #{id}
+            </foreach>
+        </if>
+    </select>
+
     <select id="getUserAndPositionCount" parameterType="com.adc.da.slrs.sarUser.entity.TsUser" resultType="java.lang.Integer">
         select count(u.USID) from ts_user u
         left join ts_user_position up

adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java

@@ -340,10 +340,8 @@ public class DicTypeEORestController extends BaseController<DicTypeEO> {
     @GetMapping("/getDicTypeListCode")
     //@RequiresPermissions("sys:dicType:getDicTypeListCode")
     public ResponseMessage<Map<String, Object>> getDicTypeListCode() throws Exception {
-
+        Map<String, Object> dicTypeEO = dicTypeEOService.getDicTypeListCode();
-        return Result.success("1","hello");
+        return Result.success(dicTypeEO);
-//        Map<String, Object> dicTypeEO = dicTypeEOService.getDicTypeListCode();
-//        return Result.success(dicTypeEO);
     }
 
     /**

doc/sql/20220122_模块单元数据表新增字段.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `sar_model_tree` 
+ADD COLUMN `MODEL_TYPE` varchar(20) NULL COMMENT '模块数据类型(CAR:乘用车;TRUCK:卡车)' AFTER `HAS_CHILDREN`,
+ADD COLUMN `MODEL_PID` varchar(100) NULL COMMENT '模块父级ID' AFTER `MODEL_TYPE`,
+ADD COLUMN `MODEL_LEVEL` int(2) NULL COMMENT '模块层级' AFTER `MODEL_PID`;;