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

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!55
This commit is contained in:
高嵩
2023-04-19 14:47:22 +08:00
parent a0d4b4aa32 3061dd4536
commit 0083b13d26
8 changed files with 60 additions and 8 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
+5
View File
@@ -492,4 +492,9 @@ public interface workFlowFeignClient {
ResponseMessage<BusProcessNew> questionsAndAnswers(@RequestParam("askId") String askId, @RequestParam("answerer") String answerer);
@RequestMapping(value = "/bat-wkflow/deleteOATask",method = RequestMethod.GET)
String deleteOATask(@RequestParam("pId") String pId);
@RequestMapping(value = "/bat-wkflow/deleteOATaskInfo",method = RequestMethod.GET)
String deleteOATaskInfo(@RequestParam("pId") String pId);
@RequestMapping(value = "/bat-wkflow/datas/bus-process-new/updateBusProcessNew",method = RequestMethod.GET)
ResponseMessage<BusProcessNew> updateBusProcessNew(@RequestParam("id") String id, @RequestParam("mags") String mags);
}
adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java
+10
View File
@@ -450,4 +450,14 @@ public class workFlowFeignClientImpl {
public String deleteOATask(@RequestParam("pId") String pId) {
return workFlowFeignClient.deleteOATask(pId);
}
public String deleteOATaskInfo(@RequestParam("pId") String pId) {
return workFlowFeignClient.deleteOATaskInfo(pId);
}
public ResponseMessage<BusProcessNew> updateBusProcessNew(BusMes busMes) {
String id = busMes.getId();
String mags = busMes.getJson();
return workFlowFeignClient.updateBusProcessNew(id,mags);
}
}
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+20 -5
View File
@@ -536,6 +536,7 @@ public class WorkFlowController {
data.setShowreceive(true);
}
}
}
}
return pageInfo;
@@ -1178,10 +1179,6 @@ public class WorkFlowController {
qbfsForm.put("prcCreateUser",asList.get(0));
qbfsForm.put("prcCreateUserName",byIdUseLevel.getUname());
// if(jsonObject.get("prcCreateUser")!=null){
// busMes.setUserId(jsonObject.get("prcCreateUser").toString());
// }
//起草人
processRollBackEO.setUserId(asList.get(0));
processRollBackEO.setType("25");
@@ -1211,7 +1208,7 @@ public class WorkFlowController {
return workFlowFeignClient.questionsAndAnswers(askId,answerer);
}
@ApiOperation(value = "删除OA代办任务 pid")
@ApiOperation(value = "删除OA代办任务 pid（制修订专用）")
@GetMapping("/deleteOATask")
public String deleteOATask(@RequestParam("pIds") String pIds) {
if(StringUtils.isNotBlank(pIds)){
@@ -1222,4 +1219,22 @@ public class WorkFlowController {
}
return "1";
}
@ApiOperation(value = "删除OA代办任务 pid（通用）")
@GetMapping("/deleteOATaskInfo")
public String deleteOATaskInfo(@RequestParam("pIds") String pIds) {
if(StringUtils.isNotBlank(pIds)){
String[] split = pIds.split(",");
for (String pId: split){
workFlowFeignClient.deleteOATaskInfo(pId);
}
}
return "1";
}
@ApiOperation(value = "起草 保存（通过id和json进行修改数据）")
@PostMapping("/updateBusProcessNew")
public ResponseMessage<BusProcessNew> updateBusProcessNew(BusMes busMes) {
return workFlowFeignClient.updateBusProcessNew(busMes);
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java
+4
View File
@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.*;
@RestController
@@ -151,6 +152,9 @@ public class EarlyWarningEOController extends BaseController<EarlyWarningEO> {
// List<StandWarningEO> exportExcel = earlyWarningEOService.getExportExcel(excelVO);
List<WarningExportVO> exportExcel = earlyWarningEOService.getExportExcel(excelVO);
for (WarningExportVO warningExportVO : exportExcel){
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
String format = simpleDateFormat.format(warningExportVO.getPutTime());
warningExportVO.setPutTimeStr(format);
String condition = warningExportVO.getTermsConditions();
if (condition != null && condition.length() > 32001){
condition = condition.substring(0,32000);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java
+2 -2
View File
@@ -60,8 +60,8 @@ public class EarlyWarningEO extends BaseEntity {
@TableField(exist = false)
private String standName;
@ExcelProperty(value = "发布日期",index = 6)
@ColumnWidth(20)
// @ExcelProperty(value = "发布日期",index = 6)
// @ColumnWidth(20)
@ApiModelProperty("发布日期")
@TableField(exist = false)
@DateTimeFormat(pattern="yyyy-MM-dd")
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java
+10
View File
@@ -5,6 +5,9 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@Data
public class WarningExportVO extends EarlyWarningEO {
@@ -36,5 +39,12 @@ public class WarningExportVO extends EarlyWarningEO {
@ApiModelProperty("适用车型展示")
private String applyTypeShow;
@ExcelProperty(value = "发布日期",index = 6)
@ColumnWidth(20)
@ApiModelProperty("发布日期")
@TableField(exist = false)
@DateTimeFormat(pattern="yyyy-MM-dd")
private String putTimeStr;
}
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
+2
View File
@@ -111,6 +111,7 @@
POWER,
attr.XCXSSRQ AS XCXSSRQ ,
attr.ZCCSSRQ AS ZCCSSRQ
,sarInfo.ISSUE_TIME As putTime
FROM sar_stand_warning AS warning
LEFT JOIN sar_standards_info AS sarInfo on sarInfo.id=warning.STAND_ID
LEFT JOIN sar_stand_attr_info AS attr on attr.STAND_ID=warning.STAND_ID
@@ -147,6 +148,7 @@
POWER,
items.XCXSSRQ AS XCXSSRQ ,
items.ZCCSSRQ AS ZCCSSRQ
,sarInfo.ISSUE_TIME As putTime
FROM
sar_stand_warning AS warning
LEFT JOIN sar_standards_info AS sarInfo ON sarInfo.id = warning.STAND_ID
adc-da-slrs/src/main/resources/mysql/interfaceLog.sql
+7 -1
View File
@@ -1,9 +1,15 @@
-- 福田 需要通过第三方调用的接口
-- 2023-04-18 15:22
-- 名称 通过pid删除OA待办任务 通用接口
-- 详情
-- 路径 http://localhost:9090/api/lawss/activiti/deleteOATaskInfo
-- 参数 String pIds (pIds 字符串拼接 逗号隔开)
-- 类型 Get
-- 2023-04-18
-- 名称 通过pid删除OA待办任务
-- 名称 通过pid删除OA待办任务 制修订专用
-- 详情
-- 路径 http://localhost:9090/api/lawss/activiti/deleteOATask
-- 参数 String pIds (pIds 字符串拼接 逗号隔开)