FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'dev_20230216'

Browse Source 
# Conflicts:
#   adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
This commit is contained in:
高嵩
2023-04-04 09:35:34 +08:00
parent 46a977bd0c 2ca755d253
commit 9eb62c3c65
10 changed files with 65 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
+2
View File
@@ -473,6 +473,8 @@ 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);
@RequestMapping(value = "/bat-wkflow/datas/bus-process-new/selectBusProcessNew",method = RequestMethod.GET)
String selectBusProcessNew(@RequestParam("taskId")String taskId);
@RequestMapping(value = "/bat-wkflow/datas/bus-process-new/deleteReplyToenNotice",method = RequestMethod.POST)
adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java
+4
View File
@@ -419,6 +419,10 @@ public class workFlowFeignClientImpl {
return workFlowFeignClient.getEsByWk(prcId);
}
public String deleteOAByMandatory(@RequestParam("todoId") String todoId,@RequestParam("assignee") String assignee) {
return workFlowFeignClient.deleteOAByMandatory(todoId,assignee);
}
public String selectBusProcessNew(@RequestParam("taskId")String taskId) {
return workFlowFeignClient.selectBusProcessNew(taskId);
}
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+6
View File
@@ -975,6 +975,7 @@ public class WorkFlowController {
return workFlowFeignClient.selectBusProcessNew(taskId);
}
@ApiOperation(value = "问答中心（第一个人回答以后删除其他人的代办任务以及OA提醒）")
@PostMapping("/deleteReplyToenNotice")
public List<BusProcessNew> deleteReplyToenNotice(@RequestParam("taskId") String taskId,@RequestParam("answerer") String answerer) {
@@ -985,5 +986,10 @@ 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-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+1 -2
View File
@@ -424,11 +424,10 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
return sarBussionessStandEOService.importSarBussionessStandFile(file,menuId,userId);
}
@ApiOperation(value = "|SarBussionessStand|判断原文译文")
@GetMapping("/emptyFileAnewStorage")
public ResponseMessage emptyFileAnewStorage (String type){
return sarBussionessStandEOService.emptyFileAnewStorage(type);
return sarBussionessStandEOService.emptyFileAnewStorage(type);
}
@ApiOperation(value = "|SarBussionessStand|老系统附件重复问题")
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java
-3
View File
@@ -1,7 +1,6 @@
package com.adc.da.slrs.sarBussionessStand.service;
import com.adc.da.http.ResponseMessage;
import com.adc.da.search.entity.SarBussionessStandEO;
import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport;
@@ -10,7 +9,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
import java.util.Map;
/**
* <p>
@@ -55,7 +53,6 @@ public interface ISarBussionessStandService extends IService<SarBussionessStand>
void convertDocAllQB(List<SarBussStandFile> list);
void checkFileByEncrypt();
ResponseMessage emptyFileAnewStorage(String type);
ResponseMessage<String> importSarBussionessStandFile(MultipartFile file,String menuId,String userId)throws Exception;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+8 -1
View File
@@ -25,11 +25,15 @@ import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanLogDao;
import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan;
import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlanLog;
import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService;
import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao;
import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanLogDao;
import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService;
import com.adc.da.slrs.otConvertMq.dao.OtConvertMqDao;
import com.adc.da.slrs.otConvertMq.entity.OtConvertMq;
import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao;
import com.adc.da.slrs.sarBussStandAttrInfo.entity.BusProcessEvaluationHis;
import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo;
import com.adc.da.slrs.sarBussStandAttrInfo.service.ISarBussStandAttrInfoService;
import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfoExecl;
import com.adc.da.slrs.sarBussStandAttrInfo.service.ISarBussStandAttrInfoService;
import com.adc.da.slrs.sarBussStandFile.dao.SarBussStandFileDao;
@@ -47,6 +51,9 @@ import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao;
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.sarLawsInfo.service.ISarLawsInfoService;
import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState;
import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService;
import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation;
@@ -63,7 +70,6 @@ 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.service.ITsUserService;
import com.adc.da.slrs.sarVppsTree.dao.SarVppsTreeDao;
@@ -91,6 +97,7 @@ import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
import org.json.JSONArray;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/dao/SarStandAttrInfoDao.java
+1
View File
@@ -46,3 +46,4 @@ public interface SarStandAttrInfoDao extends BaseMapper<SarStandAttrInfo> {
String selectInfoStandId(@Param("standId")String standId);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java
+1
View File
@@ -112,3 +112,4 @@ public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {
List<OldSystem> selectOldSystemInfoByBuidId(@Param("buildId") String buildId);
}
adc-da-slrs/src/main/resources/mybatis/mapper/SarStandAttrInfo/SarStandAttrInfoMapper.xml
+1
View File
@@ -253,3 +253,4 @@
</select>
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+41 -40
View File
@@ -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>
@@ -1966,3 +1966,4 @@
</select>
</mapper>