合并分支 'dev_20230216' 到 'master'

Dev 20230216

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

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

@@ -316,4 +316,20 @@ public class AskQuestionsController extends BaseController<AskQuestions> {
 
         return askQuestionsService.selectAskReply(id);
     }
+
+    @PostMapping("/jump")
+    public ResponseMessage jump(String standId ,String userId) {
+        if (StringUtils.isNotBlank(standId) && StringUtils.isNotBlank(userId)) {
+            QueryWrapper<AskQuestions> objectQueryWrapper = new QueryWrapper<>();
+            objectQueryWrapper.eq("STANDARD_ID", standId);
+            objectQueryWrapper.eq("questioner", userId);
+            List<AskQuestions> list = askQuestionsService.list(objectQueryWrapper);
+            if (!list.isEmpty()) {
+                //提问
+                return Result.success("myQue");
+            }
+        }
+        //回答
+        return  Result.success("myAns");
+    }
 }

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

@@ -299,12 +299,24 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
             sarStandardsInfoEO.setMenuId("22179d54d4e640098e29");
         }
         //校验编号和名称是否存在
-        QueryWrapper<SarStandardsInfo> queryWrapper = new QueryWrapper<>();
+//        QueryWrapper<SarStandardsInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(null!=sarStandardsInfoEO.getStandNumber(),"STAND_NUMBER",sarStandardsInfoEO.getStandNumber())
+//        queryWrapper.eq(null!=sarStandardsInfoEO.getStandNumber(),"STAND_NUMBER",sarStandardsInfoEO.getStandNumber())
-                    .eq(null!=sarStandardsInfoEO.getStandName(),"STAND_NAME",sarStandardsInfoEO.getStandName());
+//                .eq(null!=sarStandardsInfoEO.getStandName(),"STAND_NAME",sarStandardsInfoEO.getStandName());
-        Integer s1 = sarStandardsInfoEOService.count(queryWrapper);
+        String standnumber = "";
-        if (s1>0){
+        if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())){
-            return  Result.error("当前标准编号和中文名称已存在");
+            standnumber = sarStandardsInfoEO.getStandSort() + sarStandardsInfoEO.getStandNumber() + "-" + sarStandardsInfoEO.getStandYear();
+        }else {
+            standnumber = sarStandardsInfoEO.getStandSort() + sarStandardsInfoEO.getStandNumber();
+        }
+        List<SarStandardsInfo> list = sarStandardsInfoEOService.listQuery(sarStandardsInfoEO);
+        String valIdFlag = "0";
+        for (SarStandardsInfo stand :list){
+            if ((list.size() ==1 && !list.get(0).getId().equals(sarStandardsInfoEO.getId())) || list.size() >1){
+                valIdFlag = stand.getValidFlag();
+                if (valIdFlag.equals("0")){
+                    return Result.error("企标编号("+ standnumber +")或企标名称("+ sarStandardsInfoEO.getStandName() +")已存在");
+                }
+            }
         }
         sarStandardsInfoEOService.createSarStandardsInfo(sarStandardsInfoEO);
         return Result.success("0", "添加成功", sarStandardsInfoEO);
@@ -316,12 +328,21 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
 //    @RequiresPermissions("lawss:sarStandardsInfo:updateSarStandardsInfo")
     public ResponseMessage<SarStandardsInfo> updateSarStandardsInfo(@RequestBody SarStandardsInfo sarStandardsInfoEO) throws Exception {
         //校验编号和名称是否存在
-        QueryWrapper<SarStandardsInfo> queryWrapper = new QueryWrapper<>();
+        String standnumber = "";
-        queryWrapper.eq(null!=sarStandardsInfoEO.getStandNumber(),"STAND_NUMBER",sarStandardsInfoEO.getStandNumber())
+        if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())){
-                .eq(null!=sarStandardsInfoEO.getStandName(),"STAND_NAME",sarStandardsInfoEO.getStandName());
+            standnumber = sarStandardsInfoEO.getStandSort() + sarStandardsInfoEO.getStandNumber() + "-" + sarStandardsInfoEO.getStandYear();
-        List<SarStandardsInfo> list = sarStandardsInfoEOService.list(queryWrapper);
+        }else {
-        if ((list.size() ==1 && !list.get(0).getId().equals(sarStandardsInfoEO.getId())) || list.size() >1){
+            standnumber = sarStandardsInfoEO.getStandSort() + sarStandardsInfoEO.getStandNumber();
-           return  Result.error("当前标准编号和中文名称已存在");
+        }
+        List<SarStandardsInfo> list = sarStandardsInfoEOService.listQuery(sarStandardsInfoEO);
+        String valIdFlag = "0";
+        for (SarStandardsInfo stand :list){
+            if ((list.size() ==1 && !list.get(0).getId().equals(sarStandardsInfoEO.getId())) || list.size() >1){
+                valIdFlag = stand.getValidFlag();
+                if (valIdFlag.equals("0")){
+                    return Result.error("企标编号("+ standnumber +")或企标名称("+ sarStandardsInfoEO.getStandName() +")已存在");
+                }
+            }
         }
         int result = sarStandardsInfoEOService.updateSarStandardsInfo(sarStandardsInfoEO);
         if (result > 0) {
@@ -540,7 +561,7 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
     @PostMapping("/validateStandNumber")
     //@RequiresPermissions("lawss:sarStandardsInfo:selectReplaceStandNum")
     public ResponseMessage validateStandNumber(SarStandardsInfoEOPage page) throws Exception {
-        if (StringUtils.isNotEmpty(page.getStandNumber()) && StringUtils.isNotEmpty(page.getStandSort())) {
+        if (StringUtils.isNotEmpty(page.getStandNumber()) && StringUtils.isNotEmpty(page.getStandSort()) && StringUtils.isNotBlank(page.getStandName())) {
             SarStandardsInfoEOPage newQueryPage = new SarStandardsInfoEOPage();
             String standnumber = "";
             if(StringUtils.isNotEmpty(page.getStandYear()) && !"null".equals(page.getStandYear())){
@@ -553,6 +574,7 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
                 newQueryPage.setStandSort(page.getStandSort());
                 newQueryPage.setStandNumber(page.getStandNumber());
             }
+            newQueryPage.setStandName(page.getStandName());
             List<SarStandardsInfo> standlist = sarStandardsInfoEOService.selectStandardsByStandnumber(newQueryPage, page.getStandType());
             if (standlist.size() > 0) {
                 if (StringUtils.isNotEmpty(page.getId())) {
@@ -561,12 +583,30 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
                         if (standlist.get(i).getId().equals(page.getId())) {
                             continue;
                         } else {
-                            return Result.error(standnumber + "标准号已存在");
+                            List<SarStandardsInfo> list = sarStandardsInfoEOService.listQuery2(page);
+                            String valIdFlag = "0";
+                            for (SarStandardsInfo stand :list){
+                                if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){
+                                    valIdFlag = stand.getValidFlag();
+                                    if (valIdFlag.equals("0")){
+                                        return Result.error("企标编号("+ standnumber +")或企标名称("+ page.getStandName() +")已存在");
+                                    }
+                                }
+                            }
                         }
                     }
                     return Result.success();
                 } else {
-                    return Result.error(standnumber + "标准号已存在");
+                    List<SarStandardsInfo> list = sarStandardsInfoEOService.listQuery2(page);
+                    String valIdFlag = "0";
+                    for (SarStandardsInfo stand :list){
+                        if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){
+                            valIdFlag = stand.getValidFlag();
+                            if (valIdFlag.equals("0")){
+                                return Result.error("企标编号("+ standnumber +")或企标名称("+ page.getStandName() +")已存在");
+                            }
+                        }
+                    }
                 }
             } else {
                 return Result.success();
@@ -574,6 +614,7 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
         } else {
             return Result.success();
         }
+        return Result.success();
     }
 
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java

@@ -111,5 +111,11 @@ public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {
     OldSystem loreDepotSort(@Param("sortId") String sortId);
 
     List<OldSystem> selectOldSystemInfoByBuidId(@Param("buildId") String buildId);
+
+    List<SarStandardsInfo> listQuery(SarStandardsInfo sarStandardsInfoEO);
+
+    List<SarStandardsInfo> listQuery2(SarStandardsInfoEOPage page);
+
+    List<SarStandardsInfo> selectStandardsByStandnumber2(SarStandardsInfo sarStandardsInfoEO);
 }
 

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

@@ -73,4 +73,7 @@ public interface ISarStandardsInfoService extends IService<SarStandardsInfo> {
 
     void checkFileByEncrypt();
 
+    List<SarStandardsInfo> listQuery(SarStandardsInfo sarStandardsInfoEO);
+
+    List<SarStandardsInfo> listQuery2(SarStandardsInfoEOPage page);
 }

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

@@ -3026,7 +3026,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         if(StringUtils.isNotBlank(standType)){
             sarStandardsInfoEO.setStandType(standType);
         }
-        return dao.selectStandardsByStandnumber(sarStandardsInfoEO);
+        if (StringUtils.isNotBlank(queryPage.getStandName())){
+            sarStandardsInfoEO.setStandName(queryPage.getStandName());
+        }
+        return dao.selectStandardsByStandnumber2(sarStandardsInfoEO);
     }
 
     public SarStandardsInfo selectStandardsInfoByKey(String id) throws Exception {
@@ -3666,5 +3669,15 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         logger.info("================================文件检查完毕==================================================");
     }
 
+    @Override
+    public List<SarStandardsInfo> listQuery(SarStandardsInfo sarStandardsInfoEO) {
+        return dao.listQuery(sarStandardsInfoEO);
+    }
+
+    @Override
+    public List<SarStandardsInfo> listQuery2(SarStandardsInfoEOPage page) {
+        return dao.listQuery2(page);
+    }
+
 
 }

adc-da-slrs/src/main/resources/mybatis/mapper/askQuestions/AskQuestionsMapper.xml

@@ -269,13 +269,13 @@
     <select id="selectByRId" resultType="java.lang.String">
         SELECT reply.ANSWERER
         FROM reply
-        where ASK_ID = #{id} and answerer = #{userId};
+        where ASK_ID = #{id} and answerer = #{userId} limit 1;
     </select>
 
     <select id="selectBYAQId" resultType="java.lang.String">
         SELECT ask_questions.QUESTIONER
         FROM ask_questions
-        where id = #{id}
+        where id = #{id} limit 1;
     </select>
 
     <select id="getAskQuestionsById" resultType="com.adc.da.slrs.StandardQA.entity.Reply">

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml

@@ -1965,5 +1965,79 @@
         limit ${page.pager.startIndex-1},${page.pageSize}
     </select>
 
+    <select id="selectStandardsByStandnumber2"
+            resultType="com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo">
+        select
+        <include refid="Base_Column_List"/>
+        from
+        SAR_STANDARDS_INFO
+        left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and
+        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null and dicstandSort.dic_id='JKSADFH564S')
+        where SAR_STANDARDS_INFO.valid_flag = 0
+        <!-- 标准类型 -->
+        <if test="standType != null">
+            and stand_type = #{standType}
+        </if>
+        <if test="standSort !=null and standNumber !=null and standYear !=null">
+            and (
+            SAR_STANDARDS_INFO.STAND_SORT = #{standSort} and SAR_STANDARDS_INFO.STAND_NUMBER = #{standNumber} and SAR_STANDARDS_INFO.STAND_YEAR = #{standYear}
+            )
+        </if>
+        <if test="standSort !=null and standNumber !=null and standYear ==null">
+            and (
+            SAR_STANDARDS_INFO.STAND_SORT = #{standSort} and SAR_STANDARDS_INFO.STAND_NUMBER = #{standNumber}
+            )
+        </if>
+        <if test="standName != null">
+            and SAR_STANDARDS_INFO.STAND_NAME = #{standName}
+        </if>
+        <if test="sychronId != null">
+            and id != #{sychronId}
+        </if>
+        order by SAR_STANDARDS_INFO.stand_year desc
+    </select>
+
+    <select id="listQuery2" resultType="com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo">
+        select
+        *
+        from
+        SAR_STANDARDS_INFO
+        where
+        <if test="standSort !=null and standNumber !=null and standYear !=null">
+            (
+            SAR_STANDARDS_INFO.STAND_SORT = #{standSort} and SAR_STANDARDS_INFO.STAND_NUMBER = #{standNumber} and SAR_STANDARDS_INFO.STAND_YEAR = #{standYear}
+            )
+        </if>
+        <if test="standSort !=null and standNumber !=null and standYear ==null">
+           (
+            SAR_STANDARDS_INFO.STAND_SORT = #{standSort} and SAR_STANDARDS_INFO.STAND_NUMBER = #{standNumber}
+            )
+        </if>
+        <if test="standName != null">
+            and SAR_STANDARDS_INFO.STAND_NAME = #{standName}
+        </if>
+    </select>
+
+    <select id="listQuery" resultType="com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo">
+        select
+        *
+        from
+        SAR_STANDARDS_INFO
+        where
+        <if test="standSort !=null and standNumber !=null and standYear !=null">
+            (
+            SAR_STANDARDS_INFO.STAND_SORT = #{standSort} and SAR_STANDARDS_INFO.STAND_NUMBER = #{standNumber} and SAR_STANDARDS_INFO.STAND_YEAR = #{standYear}
+            )
+        </if>
+        <if test="standSort !=null and standNumber !=null and standYear ==null">
+            (
+            SAR_STANDARDS_INFO.STAND_SORT = #{standSort} and SAR_STANDARDS_INFO.STAND_NUMBER = #{standNumber}
+            )
+        </if>
+        <if test="standName != null">
+            and SAR_STANDARDS_INFO.STAND_NAME = #{standName}
+        </if>
+    </select>
+
 </mapper>