合并分支 'dev_chaifen_20230322' 到 'master'

Dev chaifen 20230322 查看合并请求 laws-foton-slrs/foton-slrs-system-rest!25
2023-03-26 16:42:19 +08:00
parent ff6fa180ea dcc3eb755b
commit 6a683aed12
12 changed files with 1671 additions and 49 deletions
@@ -473,4 +473,6 @@ public interface workFlowFeignClient {
    void setRelation(@RequestParam("esPlanId")String esPlanId,@RequestParam("prcId") String prcId, @RequestParam("finish") String finish);
    @RequestMapping(value = "/bat-wkflow/esTechRelation/getEsByWk",method = RequestMethod.GET)
    String getEsByWk(@RequestParam("prcId")String prcId);
+    @RequestMapping(value = "/bat-wkflow/deleteOAByMandatory",method = RequestMethod.GET)
+    String deleteOAByMandatory(@RequestParam("todoId") String todoId,@RequestParam("assignee") String assignee);
 }
@@ -418,4 +418,8 @@ public class workFlowFeignClientImpl {
    public String getEsByWk(@RequestParam("prcId")String prcId) {
        return workFlowFeignClient.getEsByWk(prcId);
    }
+
+    public String deleteOAByMandatory(@RequestParam("todoId") String todoId,@RequestParam("assignee") String assignee) {
+        return workFlowFeignClient.deleteOAByMandatory(todoId,assignee);
+    }
 }
@@ -953,4 +953,9 @@ public class WorkFlowController {
        return workFlowFeignClient.getEsByWk(prcId);
    }

+    @ApiOperation(value = "OA待办强制删除")
+    @GetMapping("/deleteOAByMandatory")
+    public String deleteOAByMandatory(@RequestParam("todoId") String todoId,@RequestParam("assignee") String assignee) {
+        return workFlowFeignClient.deleteOAByMandatory(todoId,assignee);
+    }
 }
@@ -376,7 +376,11 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
    }


-
+    @ApiOperation(value = "|SarBussionessStand|判断原文译文")
+    @GetMapping("/emptyFileAnewStorage")
+    public ResponseMessage emptyFileAnewStorage (String type){
+        return sarBussionessStandEOService.emptyFileAnewStorage(type);
+    }


 }
@@ -0,0 +1,39 @@
+package com.adc.da.slrs.sarBussionessStand.entity;
+
+import lombok.Data;
+
+@Data
+public class OldSystem {
+
+    //kmpro_addon34 与 buss_id 对应
+    private String loreDocId;
+    //lore_depot_sort
+    private String sortId;
+    //lore_attache
+    private String fileSign;
+    //lore_attache
+    private String fileSrc;
+    //lore_depot_sort
+    private String sortSign;
+    //lore_attache
+    private String ext;
+
+    //新系统返回数据所需要的
+    private String attfid;
+
+    private String standId;
+
+    private String buildId;
+
+    private String fileId;
+
+    private String standNumber;
+
+
+    // 需要组合的数据
+    private String attFileId;
+
+    private String original;
+
+    private String Translation;
+}
@@ -0,0 +1,15 @@
+package com.adc.da.slrs.sarBussionessStand.entity;
+
+import lombok.Data;
+
+@Data
+public class OldSystemVo {
+
+    private String id;
+    //标准号
+    private String standNumber;
+    //译文件
+    private String translateFileId;
+    //原文件
+    private String originalFileId;
+}
@@ -54,5 +54,6 @@ public interface ISarBussionessStandService extends IService<SarBussionessStand>

    void checkFileByEncrypt();

+    ResponseMessage emptyFileAnewStorage(String type);
 }

@@ -41,4 +41,9 @@ public interface SarStandAttrInfoDao extends BaseMapper<SarStandAttrInfo> {
    String selectFieldValByStandId(@Param("field") String field, @Param("standId") String standId);

    List<SelectionResult> selectFieldValByContainsVal(@Param("field") String field, @Param("value") String value, @Param("standIds") List<String> standIds);
+
+    void updateByIdInfo(@Param("id")String id,@Param("fbgbjbd") String fbgbuss,@Param("fbgywbd") String fbgywbd);
+
+    String selectInfoStandId(@Param("standId")String standId);
 }
+
@@ -1,5 +1,6 @@
 package com.adc.da.slrs.sarStandardsInfo.dao;

+import com.adc.da.slrs.sarBussionessStand.entity.OldSystem;
 import com.adc.da.slrs.sarStandardsInfo.entity.DSarStandardDTO;
 import com.adc.da.slrs.sarStandardsInfo.entity.RecommendVO;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
@@ -99,4 +100,16 @@ public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {

    List<DSarStandardDTO> dealWithDS(@Param("type") String standType, @Param("status")List<String> strings);

+    List<OldSystem> selectListInfo(@Param("type") String type);
+
+    List<OldSystem> OldSystemFile(@Param("loreDocId") String loreDocId);
+
+    List<OldSystem> selectOldSystemFile();
+
+    List<OldSystem> selectOldSystemFileBuildId(@Param("buildId") String buildId);
+
+    OldSystem loreDepotSort(@Param("sortId") String sortId);
+
+    List<OldSystem> selectOldSystemInfoByBuidId(@Param("buildId") String buildId);
 }
+
@@ -241,4 +241,16 @@
        </if>
    </select>

+    <update id="updateByIdInfo" >
+        update SAR_STAND_ATTR_INFO ss set ss.FBGBJBD = #{fbgbjbd}, ss.FBGYWBD = #{fbgywbd}
+        where id = #{id}
+    </update>
+
+    <select id="selectInfoStandId" resultType="java.lang.String" parameterType="java.lang.String">
+        SELECT id
+        FROM SAR_STAND_ATTR_INFO
+        WHERE stand_id = #{standId} and valid_flag=0
+    </select>
+
 </mapper>
+
@@ -998,15 +998,15 @@
                </if>
                )
                <!--  and SAR_STANDARDS_INFO.STAND_YEAR = ''-->
-               <!--    or (stand_name like concat(concat('%',#{page.standNumber}),'%')) -->
+                <!--    or (stand_name like concat(concat('%',#{page.standNumber}),'%')) -->
                )
            </if>
            <!-- 标准名称 -->
            <if test="page.standName != null and page.standName != ''">
                and stand_name like concat(concat('%',#{page.standName}),'%')
-            <!--  or STAND_NUMBER like concat(concat('%',#{page.standName}),'%') -->
-            <!--  or STAND_YEAR like concat(concat('%',#{page.standName}),'%') -->
-            <!--  or STAND_SORT like concat(concat('%',#{page.standName}),'%') -->
+                <!--  or STAND_NUMBER like concat(concat('%',#{page.standName}),'%') -->
+                <!--  or STAND_YEAR like concat(concat('%',#{page.standName}),'%') -->
+                <!--  or STAND_SORT like concat(concat('%',#{page.standName}),'%') -->
            </if>
            <if test="page.standEnName != null and page.standEnName != ''">
                and stand_en_name like concat(concat('%',#{page.standEnName}),'%')
@@ -1075,7 +1075,7 @@
            <if test="page.standYear != null and page.standYear != ''">
                and SAR_STANDARDS_INFO.STAND_YEAR = #{page.standYear}
            </if>
-<!--             发布日期日期-->
+            <!--             发布日期日期-->
            <if test="page.issueTime != null and page.issueTime != ''">
                and DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME  ,'%Y-%m-%d') = #{page.issueTime}
            </if>
@@ -1555,34 +1555,34 @@



-           <!-- and (
-                ( ( #{standNumber}) like CONCAT('%',dicstandSort.DIC_TYPE_NAME,'%')
-                and
-                ( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_NUMBER,'%')
-                and
-                ( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_YEAR,'%')  and SAR_STANDARDS_INFO.STAND_YEAR != '' )
-                or (( #{standNumber}) like CONCAT('%',dicstandSort.DIC_TYPE_NAME,'%')
-                and
-                ( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_NUMBER,'%')
-                )
-                and SAR_STANDARDS_INFO.STAND_YEAR = ''
-            ) -->
-        </if>
-          <if test="standCode != null">
-              and (
-              (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
-              SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '')
-              or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ',''))
-              )
-              <!-- and SAR_STANDARDS_INFO.STAND_YEAR = '' -->
-              or (stand_name like concat(concat('%',#{standNumber}),'%'))
-              )
-          </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}
+            <!-- and (
+                 ( ( #{standNumber}) like CONCAT('%',dicstandSort.DIC_TYPE_NAME,'%')
+                 and
+                 ( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_NUMBER,'%')
+                 and
+                 ( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_YEAR,'%')  and SAR_STANDARDS_INFO.STAND_YEAR != '' )
+                 or (( #{standNumber}) like CONCAT('%',dicstandSort.DIC_TYPE_NAME,'%')
+                 and
+                 ( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_NUMBER,'%')
                 )
-          </if>
+                 and SAR_STANDARDS_INFO.STAND_YEAR = ''
+             ) -->
+        </if>
+        <if test="standCode != null">
+            and (
+            (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
+            SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '')
+            or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ',''))
+            )
+            <!-- and SAR_STANDARDS_INFO.STAND_YEAR = '' -->
+            or (stand_name like concat(concat('%',#{standNumber}),'%'))
+            )
+        </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}
@@ -1676,10 +1676,10 @@
    <select id="getSarStandardsExportInfo" resultMap="BaseResultMapExcel"
            parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage">
        select a.* from (
-            select<include refid="Base_Column_List_Export_Show"/>
-            from SAR_STANDARDS_INFO
-            <include refid="SarStandardsInfo_Where_Export_Clause"/>
-            GROUP BY <include refid="Group_Column_List_Export_Show"/>
+        select<include refid="Base_Column_List_Export_Show"/>
+        from SAR_STANDARDS_INFO
+        <include refid="SarStandardsInfo_Where_Export_Clause"/>
+        GROUP BY <include refid="Group_Column_List_Export_Show"/>
        ) a
        order by
        <if test='orderByA != null and orderByA != "" and order1 != null and order1 != ""'>
@@ -1796,7 +1796,7 @@
    </update>
    <update id="updateISRELATEACCESSById">

-    UPDATE sar_standards_info set IS_RELATE_ACCESS = #{IS_RELATE_ACCESS} WHERE ID IN
+        UPDATE sar_standards_info set IS_RELATE_ACCESS = #{IS_RELATE_ACCESS} WHERE ID IN
        <foreach collection="list" item="id" index="index"  open="(" separator="," close=")">
            #{id}
        </foreach>
@@ -1872,15 +1872,15 @@
            )
    </select>
    <select id="dealWithDS" resultType="com.adc.da.slrs.sarStandardsInfo.entity.DSarStandardDTO">
-         SELECT ss.ID , ss.TEXT_STATUS , ssa.SSRQ from sar_standards_info ss
-         LEFT JOIN sar_stand_attr_info  ssa ON ssa.STAND_ID = ss.id
+        SELECT ss.ID , ss.TEXT_STATUS , ssa.SSRQ from sar_standards_info ss
+        LEFT JOIN sar_stand_attr_info  ssa ON ssa.STAND_ID = ss.id
        <where>
            1=1 and ss.valid_flag = 0 and ssa.valid_flag = 0
            <if test="type != null">
                and ss.STAND_TYPE = #{type}
            </if>
            <if test=" null != status  and status.size() >0 ">
-               and  ss.TEXT_STATUS in
+                and  ss.TEXT_STATUS in
                <foreach item="texts" collection="status" open="(" separator="," close=")" index="index">
                    #{texts}
                </foreach>
@@ -1888,4 +1888,73 @@
        </where>
    </select>

+    <select id="selectListInfo" resultType="com.adc.da.slrs.sarBussionessStand.entity.OldSystem">
+        SELECT
+        std.id as 'standId',
+        std.BUILD_ID as 'buildId',
+        std.STAND_NUMBER as 'standNumber',
+        att.id as 'attfid',
+        att.FBGBJBD as 'fileId'
+        from sar_standards_info std
+        left JOIN sar_stand_attr_info att on std.id = att.STAND_ID
+        where std.BUILD_ID is not null
+        and att.FBGBJBD is not null
+        <if test="type != null">
+            and std.STAND_TYPE =  #{type}
+        </if>
+    </select>
+
+    <select id="OldSystemFile" resultType="com.adc.da.slrs.sarBussionessStand.entity.OldSystem">
+        SELECT
+        lo.LoreDocID as 'loreDocId',
+        lo.Sign as 'fileSign',
+        lo.Src as 'fileSrc'
+        from lore_attache lo
+        where 1=1
+        <if test="loreDocId != null">
+            and  lo.LoreDocID = #{loreDocId}
+        </if>
+    </select>
+
+    <select id="selectOldSystemFile" resultType="com.adc.da.slrs.sarBussionessStand.entity.OldSystem">
+        SELECT
+        lo.ID as 'fileId',
+        lo.Sign as 'fileSign'
+        from lore_attache lo
+    </select>
+
+    <select id="selectOldSystemFileBuildId" resultType="com.adc.da.slrs.sarBussionessStand.entity.OldSystem">
+        SELECT
+        lo.Src as 'fileSrc',
+        lo.Sign as 'fileSign',
+        lo.Ext as 'ext'
+        from lore_attache lo
+        where 1=1
+        <if test="buildId != null">
+            and  lo.LoreDocId = #{buildId}
+        </if>
+    </select>
+
+    <select id="loreDepotSort" resultType="com.adc.da.slrs.sarBussionessStand.entity.OldSystem">
+        SELECT
+        lo.Sign as 'sortSign'
+        from lore_depot_sort lo
+        where 1=1
+        <if test="sortId != null">
+            and  lo.id = #{sortId}
+        </if>
+    </select>
+
+    <select id="selectOldSystemInfoByBuidId" resultType="com.adc.da.slrs.sarBussionessStand.entity.OldSystem">
+        SELECT
+        km.lore_doc_id as 'loreDocId',
+        km.sort_id as 'sortId'
+        from kmpro_addon34 km
+        where 1=1
+        <if test="buildId != null">
+            and  km.lore_doc_id = #{buildId}
+        </if>
+    </select>
+
 </mapper>
+