合并分支 'dev_20230216' 到 'master'

Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!30

adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java

@@ -153,11 +153,11 @@ public class WorkFlowController {
     }
 
     /**
+     * @return java.lang.String
      * @Author super_liu
      * @Description 根据不同浏览器定义下载文件编码
      * Date 2018/10/11 10:40
      * @Param [fileName, request]
-     * @return java.lang.String
      **/
     public String fileNameEncoding(String fileName, HttpServletRequest request) throws IOException {
         String agent = request.getHeader("User-Agent");
@@ -212,7 +212,6 @@ public class WorkFlowController {
     }
 
 
-
     @ApiOperation(value = "查询在线编辑流程汇总文件编辑对象")
     @GetMapping("/processModelHisOneCount")
     public BusProcessModelHis processModelHisOneCount(@RequestParam("pid") String pid) {
@@ -319,7 +318,6 @@ public class WorkFlowController {
 //    }
 
 
-
     @ApiOperation(value = "启动流程-以流程定义id")
     @GetMapping("/activiti_define_start")
     public ResponseMessage activiti_define_start(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam(value = "bpnId", required = false) String bpnId) {
@@ -332,6 +330,7 @@ public class WorkFlowController {
                                                           @RequestParam(value = "bpnId", required = false) String bpnId, @RequestParam(value = "json", required = false) String json) {
         return workFlowFeignClient.activiti_define_start_rollBack(id, userId, bpnId, json);
     }
+
     @ApiOperation(value = "启动流程-以流程定义id")
     @GetMapping("/activiti_define_start1")
     public Map<String, String> activiti_define_start1(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam("standName") String standName) {
@@ -473,6 +472,7 @@ public class WorkFlowController {
 
     /**
      * 复审流程使用
+     *
      * @param busMes
      * @return
      */
@@ -712,6 +712,7 @@ public class WorkFlowController {
 
     /**
      * 开始分页
+     *
      * @param list
      * @param pageNum  页码
      * @param pageSize 每页多少条数据
@@ -919,6 +920,7 @@ public class WorkFlowController {
 
     @Autowired
     ProcessTimer processTimer;
+
     @ApiOperation(value = "自动催办，任务截至时间前3天开始每天催办")
     @PostMapping("/send123")
     public String send123() {
@@ -986,10 +988,6 @@ public class WorkFlowController {
     @GetMapping("/selectAskId")
     public String selectAskId(@RequestParam("taskId") String taskId) {
         return workFlowFeignClient.selectAskId(taskId);
-    ｝
-    @ApiOperation(value = "OA待办强制删除")
-    @GetMapping("/deleteOAByMandatory")
-    public String deleteOAByMandatory(@RequestParam("todoId") String todoId,@RequestParam("assignee") String assignee) {
-        return workFlowFeignClient.deleteOAByMandatory(todoId,assignee);
     }
+
 }

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

@@ -116,7 +116,6 @@ public class WebMvcConfig implements WebMvcConfigurer {
     addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStand/exportSarBussionessStand");
 
     addInterceptor.excludePathPatterns("/api/lawss/sarFileSplitItems/exportTemplate");
-
     //预警导出
     addInterceptor.excludePathPatterns("/api/sys/EarlyWarning/exportWarning");
 

adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java

@@ -311,4 +311,9 @@ public class AskQuestionsController extends BaseController<AskQuestions> {
         return Result.success(objects);
     }
 
+    @PostMapping("/selectAskReply")
+    public ResponseMessage selectAskReply(String id){
+
+        return askQuestionsService.selectAskReply(id);
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/AskQuestionsReplyVO.java

@@ -0,0 +1,13 @@
+package com.adc.da.slrs.StandardQA.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AskQuestionsReplyVO {
+
+    private AskQuestions askQuestions;
+
+    private List<Reply> replyList;
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java

@@ -2,10 +2,14 @@ package com.adc.da.slrs.StandardQA.service.Impl;
 
 
 import com.adc.da.slrs.StandardQA.dao.AskQuestionsDao;
+import com.adc.da.slrs.StandardQA.dao.ReplyDao;
 import com.adc.da.slrs.StandardQA.entity.AskQuestions;
 import com.adc.da.slrs.StandardQA.entity.AskQuestionsPage;
+import com.adc.da.slrs.StandardQA.entity.AskQuestionsReplyVO;
 import com.adc.da.slrs.StandardQA.entity.Reply;
 import com.adc.da.slrs.StandardQA.service.AskQuestionsService;
+import com.adc.da.util.http.ResponseMessage;
+import com.adc.da.util.http.Result;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,6 +21,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -31,6 +36,9 @@ public class AskQuestionsServiceImpl extends ServiceImpl<AskQuestionsDao, AskQue
     @Autowired
     private AskQuestionsDao askQuestionsDao;
 
+    @Autowired
+    private ReplyDao replyDao;
+
     @Override
     public List<AskQuestions> getAskQuestions(AskQuestions askQuestions) {
         return askQuestionsDao.getAskQuestions(askQuestions);
@@ -110,4 +118,25 @@ public class AskQuestionsServiceImpl extends ServiceImpl<AskQuestionsDao, AskQue
     }
 
 
+    public ResponseMessage selectAskReply(String id) {
+         ArrayList<AskQuestionsReplyVO> objects = new ArrayList<>();
+         QueryWrapper<AskQuestions> objectQueryWrapper = new QueryWrapper<>();
+         objectQueryWrapper.eq("STANDARD_ID",id);
+         List<AskQuestions> askQuestions = askQuestionsDao.selectList(objectQueryWrapper);
+         if(!askQuestions.isEmpty()){
+             for (AskQuestions data:askQuestions){
+                 AskQuestionsReplyVO askQuestionsReplyVO = new AskQuestionsReplyVO();
+                 QueryWrapper<Reply> replyQueryWrapper = new QueryWrapper<>();
+                  replyQueryWrapper.eq("ASK_ID",data.getId());
+                  List<Reply> replies = replyDao.selectList(replyQueryWrapper);
+                 askQuestionsReplyVO.setAskQuestions(data);
+                 if(!replies.isEmpty()){
+                     askQuestionsReplyVO.setReplyList(replies);
+                 }
+                 objects.add(askQuestionsReplyVO);
+             }
+
+         }
+        return Result.success(objects);
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java

@@ -162,10 +162,10 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
     @Override
     public ResponseMessage<Object> addPlan(EsRevisePlan esRevisePlan) {
         esRevisePlan.setId(UUIDUtils.randomUUID(32));
-        List<EsRevisePlan> esRevisePlans=esRevisePlanDao.selectPageByName(esRevisePlan);
+//        List<EsRevisePlan> esRevisePlans=esRevisePlanDao.selectPageByName(esRevisePlan);
-        if (esRevisePlans.size()>0){
+//        if (esRevisePlans.size()>0){
-            return Result.success("企标名称不能重复,请更换新的企标名称");
+//            return Result.success("企标名称不能重复,请更换新的企标名称");
-        }else {
+//        }else {
             esRevisePlanDao.insertOne(esRevisePlan);
             //加日志
             String esName = esRevisePlan.getEsName();
@@ -181,7 +181,7 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
             }
             esRevisePlanLogDao.insert(new EsRevisePlanLog(null,id,msg,date));
             return Result.success("200", esRevisePlan.getId(), "操作成功");
-        }
+        //}
     }
 
     @Override

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java

@@ -190,6 +190,12 @@ public class SarBussStandAttrInfoExecl extends BaseEntity {
 
     private String standCode;
 
+    //模块结构单元变型号
+    private String dybxhbuss;
+
+    //模块结构单元名称
+    private String dymcbuss;
+
     @TableField(exist = false)
     private Map<String, Object> attrInfoMap = new LinkedHashMap<>();
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/dao/SarBussStandSnDao.java

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface SarBussStandSnDao extends BaseMapper<SarBussStandSn> {
 
+    String selectMaxStandnSn();
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java

@@ -16,4 +16,7 @@ public interface ISarBussStandSnService extends IService<SarBussStandSn> {
     Boolean verifySnExists(String taskId,String standSn,String standSort);
 
     Boolean modSnByProcess(String taskId);
+
+    String selectMaxStandnSn();
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java

@@ -60,4 +60,9 @@ public class SarBussStandSnServiceImpl extends ServiceImpl<SarBussStandSnDao, Sa
 
         return false;
     }
+
+    @Override
+    public String selectMaxStandnSn() {
+        return baseMapper.selectMaxStandnSn();
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java

@@ -33,6 +33,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.poi.hssf.usermodel.HSSFCellStyle;
 import org.apache.poi.hssf.usermodel.HSSFDateUtil;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
@@ -94,6 +95,9 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
     @Autowired
     ISarLawsInfoService sarLawsInfoEOService;
 
+    @Autowired
+    private ITsResourceService tsResourceService;
+
     /**
      * 根据计划库制定状态查询企标编号
      *
@@ -168,8 +172,14 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
         queryWrapper.eq(null!=sarBussionessStandEO.getStandNumber(),"STAND_NUMBER",sarBussionessStandEO.getStandNumber())
                 .eq(null!=sarBussionessStandEO.getStandName(),"STAND_NAME",sarBussionessStandEO.getStandName());
         List<SarBussionessStand> list = sarBussionessStandEOService.list(queryWrapper);
-        if ((list.size() ==1 && !list.get(0).getId().equals(sarBussionessStandEO.getId())) || list.size() >1){
+        Integer valIdFlag = 0;
-            return  Result.error("当前企标标准号和企标名称已存在");
+        for (SarBussionessStand stand :list){
+            if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){
+                valIdFlag = stand.getValidFlag();
+                if (valIdFlag == 0){
+                    throw new com.adc.da.exception.AdcDaBaseException("企标标准号"+ sarBussionessStandEO.getStandCode() +"或企标名称"+ sarBussionessStandEO.getStandName() +"已存在");
+                }
+            }
         }
         sarBussionessStandEO.setModifyTime(new Date());
         sarBussionessStandEOService.updateSarBussionessStand(sarBussionessStandEO);
@@ -422,6 +432,10 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
         @PostMapping("/importSarBussionessStandFile")
     public ResponseMessage<String> importSarBussionessStandFile(@RequestParam(value = "file",required = false)MultipartFile file,String menuId,String userId) throws Exception{
 
+            List<TsResource> tsResources  = tsResourceService.getByMenuId(menuId);
+            if (ObjectUtils.isEmpty(tsResources)) {
+                return Result.error("请选择需要导入的目录");
+            }
             return sarBussionessStandEOService.importSarBussionessStandFile(file,menuId,userId);
         }
     @ApiOperation(value = "|SarBussionessStand|判断原文译文")
@@ -510,5 +524,17 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
             org.apache.poi.util.IOUtils.closeQuietly(excelOS);
         }
     }
+
+    @ApiOperation(value = "最大顺序号查询")
+    @GetMapping("/selectMaxStandnSn")
+    public ResponseMessage selectMaxStandnSn (){
+        return sarBussionessStandEOService.selectMaxStandnSn();
+    }
+
+    @ApiOperation(value = "通过id数据")
+    @GetMapping("/selectById")
+    public ResponseMessage selectById (String id,String type){
+        return sarBussionessStandEOService.selectById(id,type);
+    }
 }
 

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

@@ -129,5 +129,6 @@ public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
 
     @Select("select * from sar")
     String setDtqbbhbuss(String dtqbbhbuss);
+
 }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java

@@ -60,5 +60,9 @@ public interface ISarBussionessStandService extends IService<SarBussionessStand>
     ResponseMessage repetitionFile();
 
     ResponseMessage newRpetitionFile();
+
+    ResponseMessage selectMaxStandnSn();
+
+    ResponseMessage selectById(String id,String type);
 }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java

@@ -53,6 +53,8 @@ import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport;
 import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
 import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService;
 import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IQualityEvaluationService;
+import com.adc.da.slrs.sarInstitution.dao.TsInstitutionDao;
+import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
 import com.adc.da.slrs.sarLawsInfo.service.ISarLawsInfoService;
 import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState;
 import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService;
@@ -70,7 +72,11 @@ import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
 import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
+import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
 import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService;
+import com.adc.da.slrs.sarUser.dao.TsUserDao;
+import com.adc.da.slrs.sarUser.entity.TsUser;
+import com.adc.da.slrs.sarUser.entity.UpDTO;
 import com.adc.da.slrs.sarUser.service.ITsUserService;
 import com.adc.da.slrs.sarVppsTree.dao.SarVppsTreeDao;
 import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
@@ -259,12 +265,16 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
     @Autowired
     private SarStandardsInfoDao sarStandardsInfoDao;
 
-    @Autowired
-    private ITsResourceService tsResourceService;
 
     @Autowired
     private SarVppsTreeDao sarVppsTreeDao;
 
+    @Autowired
+    private TsUserDao tsUserDao;
+
+    @Autowired
+    private TsInstitutionDao tsInstitutionDao;
+
     @Override
     public SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort,String taskId){
         SarBussionessStand bussionessStand = new SarBussionessStand();
@@ -2048,13 +2058,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
      */
     @Override
     public ResponseMessage<String> importSarBussionessStandFile(MultipartFile file,String menuId,String userId)throws Exception {
-
-         List<TsResource> tsResources  = tsResourceService.getByMenuId(menuId);
-         if (ObjectUtils.isEmpty(tsResources)) {
-             return Result.error("请选择需要导入的目录");
-         }
              //给出头部信息
-             String[] headerExcel = {"*企标类别,企标编号,*标准年份,*企标名称,企标英文名称,*文本状态,发布日期,企标实施日期,起草部门,起草人,适用车型,能源类型,适用产品线,体系类别,关联模块-乘用车VPPS编码,关联模块--卡车VPPS编码,发布稿,编制说明,历史版本,其他文件,修改单,代替企标编号,采用标准,采标程度,引用标准,关联文件,"};
+             String[] headerExcel = {"*企标类别,*企标编号,*标准年份,*企标名称,企标英文名称,*文本状态,发布日期,企标实施日期,起草部门,起草人,适用车型,能源类型,适用产品线,体系类别,关联模块-乘用车VPPS编码,关联模块--卡车VPPS编码,发布稿,编制说明,历史版本,其他文件,修改单,代替企标编号,采用标准,采标程度,引用标准,关联文件,"};
 
              //获取文件全称
              String fileNameStr = file.getOriginalFilename();
@@ -2164,7 +2169,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                              }
                                              if (i != 0 && i != 1 && !rowList.equals("") && rowList != null ) {
 
-                                                 int count = 1;
+                                                 int count = 2;
                                                  count++;
 
                                                  String standSort = rowList.get("*企标类别");
@@ -2294,8 +2299,16 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                      return Result.error("第"+ count +"行企标类别不能为空");
                                                  }
 
-                                                 String standNumber = rowList.get("企标编号");
+                                                 String standNumber = rowList.get("*企标编号");
+                                                 if (StringUtils.isNotBlank(standNumber)){
+                                                     if (standNumber.length() > 100){
+                                                         return Result.error("第"+ count +"行企标编号输入过长");
+                                                     }
                                                      sarBussStandAttrInfo.setStandNumber(standNumber);
+                                                 }else {
+                                                     return Result.error("第"+ count +"行企标编号不能为空");
+                                                 }
+
 
                                                  String standYear = rowList.get("*标准年份");
                                                  if (StringUtils.isNotBlank(standYear)) {
@@ -2378,19 +2391,33 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
 
 
                                                  String qcdw = rowList.get("起草部门");
+                                                 String qcbm = tsInstitutionDao.selectByName(qcdw);
+                                                 if (qcdw != null && !qcdw.equals("")){
+                                                         if (!qcdw.equals(qcbm)){
+                                                             return Result.error("第"+ count +"行输入的起草部门不存在");
+                                                         }
                                                          if (StringUtils.isNotBlank(qcdw)) {
                                                              if (qcdw.length() > 100) {
                                                                  return Result.error("第"+ count +"行输入的起草部门过长");
                                                              }
+                                                         }
                                                      sarBussStandAttrInfo.setQcdw(qcdw);
                                                  }
 
                                                  String qcrbuss = rowList.get("起草人");
-                                                 if (StringUtils.isNotBlank(qcrbuss)) {
+                                                 String account = tsUserDao.selectByAccount(qcrbuss);
+                                                 QueryWrapper<TsUser> queryWrapper = new QueryWrapper<>();
+                                                 queryWrapper.eq(qcrbuss != null,"UNAME",qcrbuss)
+                                                         .eq(account != null,"ACCOUNT",account);
+                                                 TsUser tsUser = tsUserDao.selectOne(queryWrapper);
+                                                 if (qcrbuss != null && !qcrbuss.equals("")) {
+                                                         if (!account.equals(tsUser.getAccount()) && !qcrbuss.equals(tsUser.getUname())){
+                                                             return Result.error("第"+ count +"行输入的起草人名称不存在");
+                                                         }
                                                          if (qcrbuss.length() > 100) {
                                                              return Result.error("第"+ count +"行输入的起草人过长");
                                                          }
-                                                     sarBussStandAttrInfo.setQcrbuss(qcrbuss);
+                                                     sarBussStandAttrInfo.setQcrbuss(qcrbuss + "(" + account + ")");
                                                  }
 
                                                  String sycxclass = rowList.get("适用车型");
@@ -2482,6 +2509,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                  String kcvppscnbuss = sarVppsTreeDao.getKcvppscnbuss(sarBussStandAttrInfo.getKcvppsbmbuss());
                                                  sarBussStandAttrInfo.setKcvppscnbuss(kcvppscnbuss);
 
+//                                                 //模块结构单元变型号
+//                                                 String dybxhbuss = rowList.get("模块结构单元变型号");
+//                                                 sarBussStandAttrInfo.setDybxhbuss(dybxhbuss);
+//
+//                                                 //模块结构单元名称
+//                                                 String dymcbuss = rowList.get("模块结构单元名称");
+//                                                 sarBussStandAttrInfo.setDymcbuss(dymcbuss);
 
                                                  String dtqbbhbuss = rowList.get("代替企标编号");
                                                  sarBussStandAttrInfo.setDtqbbhbuss(dtqbbhbuss);
@@ -2524,7 +2558,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                                  String fjName = split[j];
                                                                  int one = fjName.lastIndexOf(".");
                                                                  String split2 = fjName.substring(one + 1).toLowerCase();
-                                                                 if (split2.equals("pdf") || split2.equals("ppt") || split2.equals("pptx") || split2.equals("doc") || split2.equals("docx") || split2.equals("xls") || split2.equals("xlsx")) {
+                                                                 if (split2.equals("pdf") || split2.equals("ppt") || split2.equals("pptx") || split2.equals("doc") || split2.equals("docx")) {
                                                                          String name = fileInfo.getName();
                                                                          String[] split1 = fileInfo.toString().split(name);
                                                                          File files = new File(split1[0] + split[j]);
@@ -2535,8 +2569,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                                              s = attFileVo.getAttId();
                                                                          }
                                                                      } else {
-                                                                        logger.info("第"+ count +"行" +fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/xls/xlsx格式的附件");
+                                                                        logger.info("第"+ count +"行" +fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx格式的附件");
-                                                                         return Result.error("第"+ count +"行"+fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/xls/xlsx格式的附件");
+                                                                         return Result.error("第"+ count +"行"+fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx格式的附件");
                                                                      }
                                                                  }
                                                              sarBussStandAttrInfo.setFbgbuss(s);
@@ -2552,7 +2586,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                              String fjName = split[j];
                                                              int one = fjName.lastIndexOf(".");
                                                              String split2 = fjName.substring(one + 1).toLowerCase();
-                                                             if (split2.equals("pdf") || split2.equals("ppt") || split2.equals("pptx") || split2.equals("doc") || split2.equals("docx") || split2.equals("xls") || split2.equals("xlsx")) {
+                                                             if (split2.equals("pdf") || split2.equals("ppt") || split2.equals("pptx") || split2.equals("doc") || split2.equals("docx")) {
                                                                  String name = fileInfo.getName();
                                                                  String[] split1 = fileInfo.toString().split(name);
                                                                  File files = new File(split1[0] + split[j]);
@@ -2563,8 +2597,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                                      s = attFileVo.getAttId();
                                                                  }
                                                              } else {
-                                                                 logger.info("第"+ count +"行"+ fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/xls/xlsx格式的附件");
+                                                                 logger.info("第"+ count +"行"+ fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx格式的附件");
-                                                                 return Result.error("第"+ count +"行"+ fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/xls/xlsx格式的附件");
+                                                                 return Result.error("第"+ count +"行"+ fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx格式的附件");
                                                              }
                                                          }
                                                          sarBussStandAttrInfo.setBzsmbuss(s);
@@ -2580,7 +2614,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                              String fjName = split[j];
                                                              int one = fjName.lastIndexOf(".");
                                                              String split2 = fjName.substring(one + 1).toLowerCase();
-                                                             if (split2.equals("pdf") || split2.equals("ppt") || split2.equals("pptx") || split2.equals("doc") || split2.equals("docx") || split2.equals("xls") || split2.equals("xlsx")) {
+                                                             if (split2.equals("pdf") || split2.equals("ppt") || split2.equals("pptx") || split2.equals("doc") || split2.equals("docx")) {
                                                                  String name = fileInfo.getName();
                                                                  String[] split1 = fileInfo.toString().split(name);
                                                                  File files = new File(split1[0] + split[j]);
@@ -2591,8 +2625,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                                      s = attFileVo.getAttId();
                                                                  }
                                                              } else {
-                                                                 logger.info("第"+ count +"行"+fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/xls/xlsx格式的附件");
+                                                                 logger.info("第"+ count +"行"+fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx格式的附件");
-                                                                 return Result.error("第"+ count +"行"+fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/xls/xlsx格式的附件");
+                                                                 return Result.error("第"+ count +"行"+fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx格式的附件");
                                                              }
                                                          }
                                                          sarBussStandAttrInfo.setLsbbbuss(s);
@@ -2608,7 +2642,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                              String fjName = split[j];
                                                              int one = fjName.lastIndexOf(".");
                                                              String split2 = fjName.substring(one + 1).toLowerCase();
-                                                             if (split2.equals("pdf") || split2.equals("ppt") || split2.equals("pptx") || split2.equals("doc") || split2.equals("docx") || split2.equals("xls") || split2.equals("xlsx") || split2.equals("png")) {
+                                                             if (split2.equals("pdf") || split2.equals("ppt") || split2.equals("pptx") || split2.equals("doc") || split2.equals("docx") || split2.equals("png")) {
                                                                  String name = fileInfo.getName();
                                                                  String[] split1 = fileInfo.toString().split(name);
                                                                  File files = new File(split1[0] + split[j]);
@@ -2619,8 +2653,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                                      s = attFileVo.getAttId();
                                                                  }
                                                              } else {
-                                                                 logger.info("第"+ count +"行"+fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/xls/xlsx/png格式的附件");
+                                                                 logger.info("第"+ count +"行"+fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/png格式的附件");
-                                                                 return Result.error("第"+ count +"行"+fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/xls/xlsx/png格式的附件");
+                                                                 return Result.error("第"+ count +"行"+fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/png格式的附件");
                                                              }
                                                          }
                                                          sarBussStandAttrInfo.setQtwjbuss(s);
@@ -2636,7 +2670,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                              String fjName = split[j];
                                                              int one = fjName.lastIndexOf(".");
                                                              String split2 = fjName.substring(one + 1).toLowerCase();
-                                                             if (split2.equals("pdf") || split2.equals("ppt") || split2.equals("pptx") || split2.equals("doc") || split2.equals("docx") || split2.equals("xls") || split2.equals("xlsx")) {
+                                                             if (split2.equals("pdf") || split2.equals("ppt") || split2.equals("pptx") || split2.equals("doc") || split2.equals("docx")) {
                                                                  String name = fileInfo.getName();
                                                                  String[] split1 = fileInfo.toString().split(name);
                                                                  File files = new File(split1[0] + split[j]);
@@ -2647,8 +2681,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                                      s = attFileVo.getAttId();
                                                                  }
                                                              } else {
-                                                                 logger.info("第"+ count +"行"+fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/xls/xlsx格式的附件");
+                                                                 logger.info("第"+ count +"行"+fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx格式的附件");
-                                                                 return Result.error("第"+ count +"行"+fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/xls/xlsx格式的附件");
+                                                                 return Result.error("第"+ count +"行"+fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx格式的附件");
                                                              }
                                                          }
                                                          sarBussStandAttrInfo.setXgd(s);
@@ -2664,7 +2698,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                              String fjName = split[j];
                                                              int one = fjName.lastIndexOf(".");
                                                              String split2 = fjName.substring(one + 1).toLowerCase();
-                                                             if (split2.equals("pdf") || split2.equals("ppt") || split2.equals("pptx") || split2.equals("doc") || split2.equals("docx") || split2.equals("xls") || split2.equals("xlsx")) {
+                                                             if (split2.equals("pdf") || split2.equals("ppt") || split2.equals("pptx") || split2.equals("doc") || split2.equals("docx")) {
                                                                  String name = fileInfo.getName();
                                                                  String[] split1 = fileInfo.toString().split(name);
                                                                  File files = new File(split1[0] + split[j]);
@@ -2675,8 +2709,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                                      s = attFileVo.getAttId();
                                                                  }
                                                              } else {
-                                                                 logger.info("第"+ count +"行"+fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/xls/xlsx格式的附件");
+                                                                 logger.info("第"+ count +"行"+fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx格式的附件");
-                                                                 return Result.error("第"+ count +"行"+fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx/xls/xlsx格式的附件");
+                                                                 return Result.error("第"+ count +"行"+fjName + "格式不正确，请上传pdf/ppt/pptx/doc/docx格式的附件");
                                                              }
                                                          }
                                                          sarBussStandAttrInfo.setGlwjbuss(s);
@@ -4318,6 +4352,34 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         return Result.success(objects);
     }
 
+    @Override
+    public ResponseMessage selectMaxStandnSn() {
+        String  max = iSarBussStandSnService.selectMaxStandnSn();
+        int maxIOnfo = 0;
+        if(StringUtils.isNotBlank(max)){
+            int i = Integer.parseInt(max);
+              maxIOnfo =  i+1;
+
+        }
+         String s = maxIOnfo + "";
+        return Result.success(s);
+    }
+
+    @Override
+    public ResponseMessage selectById(String id, String type) {
+        if(StringUtils.isNotBlank(id) && StringUtils.isNotBlank(type)){
+            if(type.equals("国内标准") || type.equals("海外标准")){
+                 SarStandardsInfo sarStandardsInfo = sarStandardsInfoDao.selectById(id);
+                return  Result.success(sarStandardsInfo);
+            }
+            if(type.equals("企业标准")){
+                 SarBussionessStand sarBussionessStand = sarBussionessStandEODao.selectById(id);
+                return  Result.success(sarBussionessStand);
+            }
+        }
+        return null;
+    }
+
     public String updateInfo(List<String> asList,String standId,String attfId) {
         //重复的集合
         List<AttFileEO> chongfu = new ArrayList<>();

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java

@@ -77,4 +77,6 @@ public interface TsInstitutionDao extends BaseMapper<TsInstitution> {
 
     int clearData();
 
+    @Select("select name from ts_institution where name = #{qcdw} limit 1")
+    String selectByName(String qcdw);
 }

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

@@ -75,4 +75,7 @@ public interface TsUserDao extends BaseMapper<TsUser> {
 
     @Select("select UNAME from ts_user where USID = #{userId}")
     String selectByName(String userId);
+
+    @Select("select ACCOUNT from ts_user where UNAME =#{qcrbuss}")
+    String selectByAccount(String qcrbuss);
 }

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

@@ -71,14 +71,14 @@ public class FieldConvertUtil {
     public static String exportName = "填写说明\n" +
             "1.导入数据从第三行开始,第一行为填写说明,第二行为表头,第三行是正式数据\n" +
             "2.所有带*号的字段必须填写\n" +
-            "3.企标类别(例如:BZJ、FT、Q-HD、Q-IOUM、Q/ASB、Q/BFC、Q/BQB等),文本状态(包含:发布、被代替、参考、即将实施、有效、直接上传、作废、待修订-指的其他企业标准),采用标准(包含:IDT等同采用、NEQ非等效采用、MOD修改采用)字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
+            "3.企标类别(例如:Q/FD),文本状态(包含:发布、被代替、参考、即将实施、有效、直接上传、作废、待修订-指的其他企业标准),采用标准(包含:IDT等同采用、NEQ非等效采用、MOD修改采用)字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
             "4.适用车型,能源类型,适用产品线字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文逗号分割\n" +
             "5.发布日期,企标实施日期字段为年-月-日格式,必须精确到日,例如(2023-04-01)\n" +
             "6.企标编号,企标名称,企标英文名称字段为文本,填写文本内容\n" +
             "7.关联模块-乘用车VPPS编码和关联模块--卡车VPPS编码是填写数据库中已有的编码从而带出乘用车VPPS名称和卡车VPPS名称\n" +
             "8.发布稿,编制说明,历史版本,其他文件,修改单,关联文件为附件文件，需要放在Excel文档同级目录中";
 
-    public static String exportFieldName = "*企标类别,企标编号,*标准年份,*企标名称,企标英文名称,*文本状态,发布日期,企标实施日期,起草部门,起草人,适用车型,能源类型,适用产品线,体系类别,关联模块-乘用车VPPS编码,关联模块--卡车VPPS编码,发布稿,编制说明,历史版本,其他文件,修改单,代替企标编号,采用标准,采标程度,引用标准,关联文件,";
+    public static String exportFieldName = "*企标类别,*企标编号,*标准年份,*企标名称,企标英文名称,*文本状态,发布日期,企标实施日期,起草部门,起草人,适用车型,能源类型,适用产品线,体系类别,关联模块-乘用车VPPS编码,关联模块--卡车VPPS编码,发布稿,编制说明,历史版本,其他文件,修改单,代替企标编号,采用标准,采标程度,引用标准,关联文件,";
 
     /***
      * @Description: Clob类型 转String

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandSn/SarBussStandSnMapper.xml

@@ -2,4 +2,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.sarBussStandSn.dao.SarBussStandSnDao">
 
+    <select id="selectMaxStandnSn" resultType="java.lang.String">
+     select Max(STAND_SN)  from sar_buss_stand_sn
+    </select>
+
 </mapper>

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

@@ -1254,4 +1254,5 @@
         update sar_buss_stand_attr_info ss set ss.FBGBUSS = #{strFile}
         where id = #{attfId}
     </update>
+
 </mapper>