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!30
This commit is contained in:
高嵩
2023-04-04 19:38:44 +08:00
parent fa59fd0aa8 a74737ccb6
commit bded4f1341
19 changed files with 371 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+158 -160
View File
@@ -101,12 +101,12 @@ public class WorkFlowController {
InputStream inputStream = null;
HttpURLConnection conn = null;
response.reset();
File file = new File(downloadUrl+modelHisOne.getEditFilePath());
File file = new File(downloadUrl + modelHisOne.getEditFilePath());
if(file.exists()){
if (file.exists()) {
try {
String fileOldName = fileNameEncoding(oldFileName,request);
response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\"");
String fileOldName = fileNameEncoding(oldFileName, request);
response.setHeader("Content-Disposition", "attachment;filename=\"" + fileOldName + "\"");
response.setContentType("application/octet-stream");
inputStream = new FileInputStream(file);
os = response.getOutputStream();
@@ -118,13 +118,13 @@ public class WorkFlowController {
org.apache.commons.io.IOUtils.closeQuietly(inputStream);
org.apache.commons.io.IOUtils.closeQuietly(os);
}
}else {
} else {
URL url;
try {
String fileOldName = fileNameEncoding(oldFileName,request);
response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\"");
String fileOldName = fileNameEncoding(oldFileName, request);
response.setHeader("Content-Disposition", "attachment;filename=\"" + fileOldName + "\"");
response.setContentType("application/octet-stream");
url = new URL(downloadUrl+modelHisOne.getEditFilePath());
url = new URL(downloadUrl + modelHisOne.getEditFilePath());
conn = (HttpURLConnection) url.openConnection();
// 设置超时间为5秒
conn.setConnectTimeout(3 * 1000);
@@ -153,13 +153,13 @@ 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 {
public String fileNameEncoding(String fileName, HttpServletRequest request) throws IOException {
String agent = request.getHeader("User-Agent");
if (agent.contains("Firefox")) {
/*BASE64Encoder base64Encoder = new BASE64Encoder();
@@ -169,21 +169,21 @@ public class WorkFlowController {
} else {
fileName = URLEncoder.encode(fileName, "utf-8");
//谷歌中空格变为+问题
fileName = fileName.replaceAll("\\+","%20");
fileName = fileName.replaceAll("\\+", "%20");
}
return fileName;
}
@ApiOperation(value = "存储在线编辑文件")
@GetMapping("/saveEditFile")
public BusProcessModelHis saveEditFile(String model){
return workFlowFeignClient.saveEditFile(model);
public BusProcessModelHis saveEditFile(String model) {
return workFlowFeignClient.saveEditFile(model);
}
@ApiOperation(value = "查询在线编辑流程汇总文件编辑对象")
@GetMapping("/processEditFile")
public BusProcessModelHis processEditFile(@RequestParam("id") String id){
return workFlowFeignClient.processEditFile(id);
public BusProcessModelHis processEditFile(@RequestParam("id") String id) {
return workFlowFeignClient.processEditFile(id);
}
@ApiOperation(value = "手机获取token")
@@ -191,14 +191,14 @@ public class WorkFlowController {
@ResponseBody
public ResponseMessage<String> loginMobile(String taskIds, String pId) throws UnsupportedEncodingException {
BusProcessNew busProcessNew = workFlowFeignClient.queryDetail(taskIds);
if(busProcessNew == null || StringUtils.isBlank(busProcessNew.getUserId())){
if (busProcessNew == null || StringUtils.isBlank(busProcessNew.getUserId())) {
return Result.error("r0011", "用户不存在");
}
TsUser userEO = userService.getById(busProcessNew.getUserId());
if (null == userEO) {
return Result.error("r0011", "用户不存在");
}
if(userEO.getDisableFlag().equals("1")){
if (userEO.getDisableFlag().equals("1")) {
return Result.error("r0011", "帐号已禁用");
}
String token = jwtUtils.generateToken(userEO.getUserId());
@@ -206,78 +206,77 @@ public class WorkFlowController {
// 加密重要信息
BASE64Encoder encoder = new BASE64Encoder();
String userStr = JSON.toJSONString(userEO);
String userStr2 = URLEncoder.encode(userStr,"UTF-8");
String userStr2 = URLEncoder.encode(userStr, "UTF-8");
userStr = encoder.encode(userStr2.getBytes());
return Result.success(userStr);
}
@ApiOperation(value = "查询在线编辑流程汇总文件编辑对象")
@GetMapping("/processModelHisOneCount")
public BusProcessModelHis processModelHisOneCount(@RequestParam("pid") String pid){
return workFlowFeignClient.processModelHisOneCount(pid);
public BusProcessModelHis processModelHisOneCount(@RequestParam("pid") String pid) {
return workFlowFeignClient.processModelHisOneCount(pid);
}
@ApiOperation(value = "更新在线编辑流程当前节点编辑状态")
@GetMapping("/processModelHisOneUpd")
public BusProcessModelHis processModelHisOneUpd(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){
return workFlowFeignClient.processModelHisOneUpdStatus(pid,taskId);
public BusProcessModelHis processModelHisOneUpd(@RequestParam("pid") String pid, @RequestParam("taskId") String taskId) {
return workFlowFeignClient.processModelHisOneUpdStatus(pid, taskId);
}
@ApiOperation(value = "查询在线编辑流程当前节点编辑对象")
@GetMapping("/processModelHisOne")
public BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){
return workFlowFeignClient.processModelHisOne(pid,taskId);
public BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid, @RequestParam("taskId") String taskId) {
return workFlowFeignClient.processModelHisOne(pid, taskId);
}
@ApiOperation(value = "根据pid 节点信息查询")
@GetMapping("/evaluationHisListByOne")
public BusProcessEvaluationHis evaluationHisListByOne(@RequestParam("pid") String pid,@RequestParam("taskInfo") String taskInfo){
return workFlowFeignClient.evaluationHisListByOne(pid,taskInfo);
public BusProcessEvaluationHis evaluationHisListByOne(@RequestParam("pid") String pid, @RequestParam("taskInfo") String taskInfo) {
return workFlowFeignClient.evaluationHisListByOne(pid, taskInfo);
}
@ApiOperation(value = "查询流程父节点所有评分(去重)返回节点评分总数")
@GetMapping("/evaluationHisListRepSum")
public Map<String,Integer> evaluationHisListRepSum(@RequestParam("pid") String pid){
return workFlowFeignClient.evaluationHisListRepSum(pid);
public Map<String, Integer> evaluationHisListRepSum(@RequestParam("pid") String pid) {
return workFlowFeignClient.evaluationHisListRepSum(pid);
}
@ApiOperation(value = "查询流程父节点所有评分(去重)")
@GetMapping("/evaluationHisListRep")
public List<BusProcessEvaluationHis> evaluationHisListRep(@RequestParam("pid") String pid){
return workFlowFeignClient.evaluationHisListRep(pid);
public List<BusProcessEvaluationHis> evaluationHisListRep(@RequestParam("pid") String pid) {
return workFlowFeignClient.evaluationHisListRep(pid);
}
@ApiOperation(value = "查询流程父节点所有评分")
@GetMapping("/evaluationHisList")
public List<BusProcessEvaluationHis> evaluationHisList(@RequestParam("pid") String pid){
return workFlowFeignClient.evaluationHisList(pid);
public List<BusProcessEvaluationHis> evaluationHisList(@RequestParam("pid") String pid) {
return workFlowFeignClient.evaluationHisList(pid);
}
@ApiOperation(value = "干活流程接收待办")
@GetMapping("/execTask")
public Map<String,Object> execTask(@RequestParam("todoId") String todoId){
return workFlowFeignClient.execTask(todoId);
public Map<String, Object> execTask(@RequestParam("todoId") String todoId) {
return workFlowFeignClient.execTask(todoId);
}
@ApiOperation(value = "管控流程接收任务")
@GetMapping("/acceptTack")
public Integer acceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("taskId") String taskId) {
sarAgenldAcceptButtonService.add(taskId);
return workFlowFeignClient.acceptTack(nowEsId,oaFlag,taskId);
return workFlowFeignClient.acceptTack(nowEsId, oaFlag, taskId);
}
@ApiOperation(value = "管控流程判断接收任务")
@GetMapping("/judgeAcceptTack")
public ResponseMessage<Boolean> judgeAcceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("prcIdGk") String prcIdGk) {
return Result.success(workFlowFeignClient.judgeAcceptTack(nowEsId,oaFlag,prcIdGk));
return Result.success(workFlowFeignClient.judgeAcceptTack(nowEsId, oaFlag, prcIdGk));
}
@ApiOperation(value = "流程实例明细验证是否完成")
@GetMapping("/get_verify_by_instance")
public Map<String,Object> activiti_define_start1(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){
return workFlowFeignClient.get_verify_by_instance(taskId,pId);
public Map<String, Object> activiti_define_start1(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId) {
return workFlowFeignClient.get_verify_by_instance(taskId, pId);
}
@ApiOperation(value = "导出excel")
@@ -288,7 +287,7 @@ public class WorkFlowController {
// if(exportExcel==null||exportExcel.getJson()==null)return;
// ExportExcelEO exportExcelEO=JSON.parseObject(exportExcel.getJson(),ExportExcelEO.class);
if(exportExcelEO.getFileName()==null||exportExcelEO.getFileName().trim().length()==0){
if (exportExcelEO.getFileName() == null || exportExcelEO.getFileName().trim().length() == 0) {
exportExcelEO.setFileName(UUID.fastUUID().toString(true));
}
List<Map<String, Object>> dataList = exportExcelEO.getDataList().stream()
@@ -319,77 +318,77 @@ 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){
return workFlowFeignClient.activiti_define_start(id,userId,bpnId);
public ResponseMessage activiti_define_start(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam(value = "bpnId", required = false) String bpnId) {
return workFlowFeignClient.activiti_define_start(id, userId, bpnId);
}
@ApiOperation(value = "启动流程-以流程定义id")
@GetMapping("/activiti_define_start_rollBack")
public ResponseMessage activiti_define_start_rollBack(@RequestParam("id") String id, @RequestParam("userId") String userId,
@RequestParam(value = "bpnId",required = false) String bpnId,@RequestParam(value = "json",required = false)String json){
return workFlowFeignClient.activiti_define_start_rollBack(id,userId,bpnId,json);
@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){
return workFlowFeignClient.activiti_define_start1(id,userId,standName);
public Map<String, String> activiti_define_start1(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam("standName") String standName) {
return workFlowFeignClient.activiti_define_start1(id, userId, standName);
}
@ApiOperation(value = "启动流程-以流程定义id")
@GetMapping("/startProcess")
public ResponseMessage startProcess(@RequestParam("type") String type, @RequestParam(value="id",required = false) String id){
if(StringUtils.isNotBlank(type)){
return this.activiti_define_start(ActDefineStartMap.actDefineStartMap(type), LoginUserUtil.getUserId(),id);
}else {
public ResponseMessage startProcess(@RequestParam("type") String type, @RequestParam(value = "id", required = false) String id) {
if (StringUtils.isNotBlank(type)) {
return this.activiti_define_start(ActDefineStartMap.actDefineStartMap(type), LoginUserUtil.getUserId(), id);
} else {
return null;
}
}
@ApiOperation(value = "启动流程-以流程定义id-加上草稿内容（为了实现撤回）")
@PostMapping("/startProcessRollBack")
public ResponseMessage startProcessRollBack(ProcessRollBackEO processRollBackEO){
if(StringUtils.isNotBlank(processRollBackEO.getType())){
return this.activiti_define_start_rollBack(ActDefineStartMap.actDefineStartMap(processRollBackEO.getType()), LoginUserUtil.getUserId(),processRollBackEO.getId(),processRollBackEO.getJson());
}else {
public ResponseMessage startProcessRollBack(ProcessRollBackEO processRollBackEO) {
if (StringUtils.isNotBlank(processRollBackEO.getType())) {
return this.activiti_define_start_rollBack(ActDefineStartMap.actDefineStartMap(processRollBackEO.getType()), LoginUserUtil.getUserId(), processRollBackEO.getId(), processRollBackEO.getJson());
} else {
return null;
}
}
@ApiOperation(value = "定时任务启动流程-以流程定义id")
@GetMapping("/startProcessNew")
public ResponseMessage startProcessNew(@RequestParam("type") String type, @RequestParam(value="userId",required = false) String userId, @RequestParam(value="id",required = false) String id){
if(StringUtils.isNotBlank(type)){
return this.activiti_define_start(ActDefineStartMap.actDefineStartMap(type), userId,id);
}else {
public ResponseMessage startProcessNew(@RequestParam("type") String type, @RequestParam(value = "userId", required = false) String userId, @RequestParam(value = "id", required = false) String id) {
if (StringUtils.isNotBlank(type)) {
return this.activiti_define_start(ActDefineStartMap.actDefineStartMap(type), userId, id);
} else {
return null;
}
}
@ApiOperation(value = "待办任务详情")
@GetMapping("/todotask")
public PageInfo<BusProcessNew> todotask(@RequestParam("userId") String userId, @RequestParam("pId") String pId){
@GetMapping("/todotask")
public PageInfo<BusProcessNew> todotask(@RequestParam("userId") String userId, @RequestParam("pId") String pId) {
workFlowFeignClient.todotask(userId, pId);
return null;
}
@ApiOperation(value = "详情")
@GetMapping("/queryDetail")
public BusProcessNew queryDetail(@RequestParam("taskIds") String taskIds){
public BusProcessNew queryDetail(@RequestParam("taskIds") String taskIds) {
return workFlowFeignClient.queryDetail(taskIds);
}
@ApiOperation(value = "入库联络人详情")
@GetMapping("/inboundLiaisonDetail")
public BusProcessNew inboundLiaisonDetail(@RequestParam("taskIds") String taskIds, @RequestParam("pId") String pId) {
return workFlowFeignClient.inboundLiaisonDetail(taskIds,pId);
return workFlowFeignClient.inboundLiaisonDetail(taskIds, pId);
}
@ApiOperation(value = "入库联络人详情")
@GetMapping("/nonconformity")
public String nonconformity(@RequestParam("taskIds") String taskIds){
public String nonconformity(@RequestParam("taskIds") String taskIds) {
return workFlowFeignClient.nonconformity(taskIds);
}
@@ -443,7 +442,7 @@ public class WorkFlowController {
@ApiOperation(value = "企标制修订评估详情")
@GetMapping("/qbzxdpgDetail")
public String qbzxdpgDetail(@RequestParam("taskIds")String taskIds){
public String qbzxdpgDetail(@RequestParam("taskIds") String taskIds) {
return workFlowFeignClient.qbzxdpgDetail(taskIds);
}
@@ -461,64 +460,65 @@ public class WorkFlowController {
@ApiOperation(value = "保存任务")
@PostMapping("/saveTask")
public Wrapper<String> saveTask(@RequestBody BusMes busMes){
public Wrapper<String> saveTask(@RequestBody BusMes busMes) {
return workFlowFeignClient.saveTask(busMes);
}
@ApiOperation(value = "行政管理要求评估流程保存")
@PostMapping("/saveTaskForXZYQ")
public Wrapper<String> saveTaskForXZYQ(BusMes busMes){
public Wrapper<String> saveTaskForXZYQ(BusMes busMes) {
return workFlowFeignClient.saveTaskForXZYQ(busMes);
}
/**
* 复审流程使用
*
* @param busMes
* @return
*/
@ApiOperation(value = "保存到代办")
@ApiOperation(value = "保存到代办")
@PostMapping("/autoSaveFirst1")
public Wrapper<String> autoSaveFirst1(@RequestBody BusMes busMes){
public Wrapper<String> autoSaveFirst1(@RequestBody BusMes busMes) {
return workFlowFeignClient.autoSaveFirst1(busMes);
}
@ApiOperation(value = "改派")
@GetMapping("/changeAssigneeNew")
public Wrapper<String> run(@RequestParam("taskId")String taskId, @RequestParam("assignee") String assignee,
@RequestParam("userId")String userId, @RequestParam("pId") String pId) {
return workFlowFeignClient.run(taskId,assignee,userId,pId);
public Wrapper<String> run(@RequestParam("taskId") String taskId, @RequestParam("assignee") String assignee,
@RequestParam("userId") String userId, @RequestParam("pId") String pId) {
return workFlowFeignClient.run(taskId, assignee, userId, pId);
}
@ApiOperation(value = "我的已办任务列表")
@PostMapping("/hastodoTasksList")
public Wrapper<Map<String, Object>> HastodoTasksListByUserId(@RequestBody TaskCommonQuery taskCommonQuery){
public Wrapper<Map<String, Object>> HastodoTasksListByUserId(@RequestBody TaskCommonQuery taskCommonQuery) {
return workFlowFeignClient.HastodoTasksListByUserId(taskCommonQuery);
}
@ApiOperation(value = "我的待办任务列表")
@PostMapping("/todoTaskList")
public PageInfo<BusProcessName> todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery){
public PageInfo<BusProcessName> todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery) {
List<BusProcessName> busProcessNames = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery);
List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize());
PageInfo<BusProcessName> pageInfo= new PageInfo<BusProcessName>();
if(busProcessNames!=null){
PageInfo<BusProcessName> pageInfo = new PageInfo<BusProcessName>();
if (busProcessNames != null) {
pageInfo.setList(list1);
pageInfo.setPageNo(taskCommonQuery.getCurrent());
pageInfo.setCount(Long.valueOf(busProcessNames.size()));
pageInfo.setPageSize(taskCommonQuery.getSize());
}else{
} else {
List<BusProcessName> list = new ArrayList<>();
pageInfo.setList(list);
pageInfo.setPageNo(taskCommonQuery.getCurrent());
pageInfo.setCount(Long.valueOf(0));
pageInfo.setPageSize(taskCommonQuery.getSize());
}
for (BusProcessName data : pageInfo.getList()){
if(StringUtils.isNotBlank(data.getTaskIds())){
for (BusProcessName data : pageInfo.getList()) {
if (StringUtils.isNotBlank(data.getTaskIds())) {
String s = sarAgenldAcceptButtonService.selectIsNot(data.getTaskIds());
if(s.equals("1")){
if (s.equals("1")) {
data.setShowreceive(false);
}else {
} else {
data.setShowreceive(true);
}
}
@@ -528,16 +528,16 @@ public class WorkFlowController {
@ApiOperation(value = "我的待办任务列表")
@PostMapping("/todoTaskListNew")
public PageInfo<BusProcessName> todoTaskListNew(@RequestBody TaskCommonQuery taskCommonQuery){
public PageInfo<BusProcessName> todoTaskListNew(@RequestBody TaskCommonQuery taskCommonQuery) {
List<BusProcessName> busProcessNames = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery);
List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize());
PageInfo<BusProcessName> pageInfo= new PageInfo<BusProcessName>();
if(busProcessNames!=null){
PageInfo<BusProcessName> pageInfo = new PageInfo<BusProcessName>();
if (busProcessNames != null) {
pageInfo.setList(list1);
pageInfo.setPageNo(taskCommonQuery.getCurrent());
pageInfo.setCount(Long.valueOf(busProcessNames.size()));
pageInfo.setPageSize(taskCommonQuery.getSize());
}else{
} else {
List<BusProcessName> list = new ArrayList<>();
pageInfo.setList(list);
pageInfo.setPageNo(taskCommonQuery.getCurrent());
@@ -549,9 +549,9 @@ public class WorkFlowController {
@ApiOperation(value = "完成任务")
@PostMapping("/completeTask")
public Wrapper<String> completeTaskByUserId( BusMes busMes){
public Wrapper<String> completeTaskByUserId(BusMes busMes) {
Wrapper<String> str = workFlowFeignClient.completeTaskByUserId(busMes);
if(str.getCode() == 500){
if (str.getCode() == 500) {
str.setSuccess(false);
}
return str;
@@ -559,9 +559,9 @@ public class WorkFlowController {
@ApiOperation(value = "特殊完成任务节点 会更·改草稿")
@PostMapping("/completeTaskNew")
public Wrapper<String> completeTaskByUserIdNew( BusMesSpecial busMes){
public Wrapper<String> completeTaskByUserIdNew(BusMesSpecial busMes) {
Wrapper<String> str = workFlowFeignClient.completeTaskByUserIdNew(busMes);
if(str.getCode() == 500){
if (str.getCode() == 500) {
str.setSuccess(false);
}
return str;
@@ -569,90 +569,90 @@ public class WorkFlowController {
@ApiOperation(value = "保存标准入库流程")
@PostMapping("/saveinboundTask")
public Wrapper<String> saveinboundTask(BusMes busMes){
public Wrapper<String> saveinboundTask(BusMes busMes) {
return workFlowFeignClient.saveinboundTask(busMes);
}
@ApiOperation(value = "整改流程保存")
@PostMapping("/saveUnqualified")
public Wrapper<String> saveUnqualified(BusMes busMes){
public Wrapper<String> saveUnqualified(BusMes busMes) {
return workFlowFeignClient.saveUnqualified(busMes);
}
@ApiOperation(value = "国内法规入库技术评估流程保存")
@PostMapping("/saveInboundLiaisonDetailForLawsAss")
public Wrapper<String> saveInboundLiaisonDetailForLawsAss(BusMes busMes){
public Wrapper<String> saveInboundLiaisonDetailForLawsAss(BusMes busMes) {
return workFlowFeignClient.saveInboundLiaisonDetailForLawsAss(busMes);
}
@ApiOperation(value = "国内法规入库项目评估流程保存")
@PostMapping("/saveProjectAssessDetail2")
public Wrapper<String> saveProjectAssessDetail2(BusMes busMes){
public Wrapper<String> saveProjectAssessDetail2(BusMes busMes) {
return workFlowFeignClient.saveProjectAssessDetail2(busMes);
}
@ApiOperation(value = "国内法规入库项目评估流程保存")
@PostMapping("/saveProjectAssessDetail3")
public Wrapper<String> saveProjectAssessDetail3(BusMes busMes){
public Wrapper<String> saveProjectAssessDetail3(BusMes busMes) {
return workFlowFeignClient.saveProjectAssessDetail3(busMes);
}
@ApiOperation(value = "国内法规入库项目评估流程保存")
@PostMapping("/saveProjectAssessDetail4")
public Wrapper<String> saveProjectAssessDetail4(BusMes busMes){
public Wrapper<String> saveProjectAssessDetail4(BusMes busMes) {
return workFlowFeignClient.saveProjectAssessDetail4(busMes);
}
@ApiOperation(value = "国内法规入库项目评估流程保存")
@PostMapping("/saveProjectAssessDetail5")
public Wrapper<String> saveProjectAssessDetail5(BusMes busMes){
public Wrapper<String> saveProjectAssessDetail5(BusMes busMes) {
return workFlowFeignClient.saveProjectAssessDetail5(busMes);
}
@ApiOperation(value = "政策法规评估流程保存")
@PostMapping("/saveZcfgpg")
public Wrapper<String> saveZcfgpg(BusMes busMes){
public Wrapper<String> saveZcfgpg(BusMes busMes) {
return workFlowFeignClient.saveZcfgpg(busMes);
}
@ApiOperation(value = "国内法规入库评估流程保存")
@PostMapping("/saveTaskForPub")
public Wrapper<String> saveTaskForPub(BusMes busMes){
public Wrapper<String> saveTaskForPub(BusMes busMes) {
return workFlowFeignClient.saveTaskForPub(busMes);
}
@ApiOperation(value = "保存任务第一步")
@PostMapping("/saveTaskFirst")
public Wrapper<String> saveTaskFirst(BusMes busMes){
public Wrapper<String> saveTaskFirst(BusMes busMes) {
return workFlowFeignClient.saveTaskFirst(busMes);
}
@ApiOperation(value = "查询任务第一步")
@GetMapping("/queryTaskFirst")
public BusProcessName queryTaskFirst(@RequestParam("bpnId")String bpnId) {
public BusProcessName queryTaskFirst(@RequestParam("bpnId") String bpnId) {
return workFlowFeignClient.queryTaskFirst(bpnId);
}
@ApiOperation(value = "查询taskid任务")
@GetMapping("/queryTaskIndex")
public BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId,@RequestParam("taskIds") String taskIds){
return workFlowFeignClient.queryTaskIndex(prcId,taskIds);
public BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId, @RequestParam("taskIds") String taskIds) {
return workFlowFeignClient.queryTaskIndex(prcId, taskIds);
}
@ApiOperation(value = "查询草稿")
@PostMapping("/queryTaskDraft")
public PageInfo<BusProcessName> queryTaskDraft(@RequestBody TaskCommonQuery taskCommonQuery){
public PageInfo<BusProcessName> queryTaskDraft(@RequestBody TaskCommonQuery taskCommonQuery) {
List<BusProcessName> busProcessNames = workFlowFeignClient.queryTaskDraft(taskCommonQuery);
List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize());
PageInfo<BusProcessName> pageInfo= new PageInfo<BusProcessName>();
if(busProcessNames!=null){
PageInfo<BusProcessName> pageInfo = new PageInfo<BusProcessName>();
if (busProcessNames != null) {
pageInfo.setList(list1);
pageInfo.setPageNo(taskCommonQuery.getCurrent());
pageInfo.setCount(Long.valueOf(busProcessNames.size()));
pageInfo.setPageSize(taskCommonQuery.getSize());
}else{
} else {
List<BusProcessName> list = new ArrayList<BusProcessName>();
pageInfo.setList(list);
pageInfo.setPageNo(taskCommonQuery.getCurrent());
@@ -664,33 +664,33 @@ public class WorkFlowController {
@ApiOperation(value = "定时任务发起流程")
@PostMapping("/autoSaveFirst")
public Wrapper<String> autoSaveFirst(@RequestBody BusMes busMes){
public Wrapper<String> autoSaveFirst(@RequestBody BusMes busMes) {
return workFlowFeignClient.autoSaveFirst(busMes);
}
@ApiOperation(value = "查询流程是否结束")
@GetMapping("/isEnd")
public String isEnd(@RequestParam("pId")String pId){
public String isEnd(@RequestParam("pId") String pId) {
return workFlowFeignClient.isEnd(pId);
}
@ApiOperation(value = "删除流程")
@GetMapping("/deleteProcessInstance")
public Wrapper<String> deleteProcessInstance(@RequestParam("pId")String pId){
public Wrapper<String> deleteProcessInstance(@RequestParam("pId") String pId) {
return workFlowFeignClient.deleteProcessInstance(pId);
}
@ApiOperation(value = "删除草稿")
@GetMapping("/deleteDraft")
public Wrapper<String> deleteDraft(@RequestParam("id")String id){
public Wrapper<String> deleteDraft(@RequestParam("id") String id) {
return workFlowFeignClient.deleteDraft(id);
}
@ApiOperation(value = "已发流程")
@PostMapping("/IssuedProcess")
public PageInfo<BusProcessName> IssuedProcess(@RequestBody TaskCommonQuery taskCommonQuery){
public PageInfo<BusProcessName> IssuedProcess(@RequestBody TaskCommonQuery taskCommonQuery) {
Page page = workFlowFeignClient.issuedProcess(taskCommonQuery);
PageInfo<BusProcessName> pageInfo= new PageInfo<BusProcessName>();
PageInfo<BusProcessName> pageInfo = new PageInfo<BusProcessName>();
pageInfo.setList(page.getList());
pageInfo.setPageNo(taskCommonQuery.getCurrent());
pageInfo.setCount(Long.valueOf(page.getCount()));
@@ -700,9 +700,9 @@ public class WorkFlowController {
@ApiOperation(value = "已办流程")
@PostMapping("/doneProcess")
public PageInfo<BusProcessName> doneProcess(@RequestBody TaskCommonQuery taskCommonQuery){
public PageInfo<BusProcessName> doneProcess(@RequestBody TaskCommonQuery taskCommonQuery) {
Page page = workFlowFeignClient.doneProcess(taskCommonQuery);
PageInfo<BusProcessName> pageInfo= new PageInfo<BusProcessName>();
PageInfo<BusProcessName> pageInfo = new PageInfo<BusProcessName>();
pageInfo.setList(page.getList());
pageInfo.setPageNo(page.getPageNo());
pageInfo.setCount(page.getCount());
@@ -712,8 +712,9 @@ public class WorkFlowController {
/**
* 开始分页
*
* @param list
* @param pageNum 页码
* @param pageNum 页码
* @param pageSize 每页多少条数据
* @return
*/
@@ -752,19 +753,19 @@ public class WorkFlowController {
@ApiOperation(value = "流程实例明细列表")
@GetMapping("/get_list_by_instance")
public List<Map<String, Object>> get_list_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){
return workFlowFeignClient.get_list_by_instance(prcNum,sortWord,shunxu);
public List<Map<String, Object>> get_list_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value = "sortWord", required = false) String sortWord, @RequestParam(value = "shunxu", required = false) String shunxu) {
return workFlowFeignClient.get_list_by_instance(prcNum, sortWord, shunxu);
}
@ApiOperation(value = "流程实例汇总列表")
@GetMapping("/get_gather_by_instance")
public List<Map<String, Object>> get_gather_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){
return workFlowFeignClient.get_gather_by_instance(prcNum,sortWord,shunxu);
public List<Map<String, Object>> get_gather_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value = "sortWord", required = false) String sortWord, @RequestParam(value = "shunxu", required = false) String shunxu) {
return workFlowFeignClient.get_gather_by_instance(prcNum, sortWord, shunxu);
}
@ApiOperation(value = "获取图片")
@GetMapping("/getImg")
public void getImg(@RequestParam("prcNum")String prcNum, HttpServletResponse response) throws IOException {
public void getImg(@RequestParam("prcNum") String prcNum, HttpServletResponse response) throws IOException {
OutputStream os = null;
response.setContentType("image/jpg");
response.flushBuffer();
@@ -776,11 +777,11 @@ public class WorkFlowController {
@ApiOperation(value = "监控流程列表")
@PostMapping("/allProcess")
public PageInfo<BusProcessName> allProcess(@RequestBody TaskCommonQuery taskCommonQuery){
Page page= workFlowFeignClient.allProcess(taskCommonQuery);
PageInfo<BusProcessName> pageInfo= new PageInfo<BusProcessName>();
public PageInfo<BusProcessName> allProcess(@RequestBody TaskCommonQuery taskCommonQuery) {
Page page = workFlowFeignClient.allProcess(taskCommonQuery);
PageInfo<BusProcessName> pageInfo = new PageInfo<BusProcessName>();
pageInfo.setPageNo(taskCommonQuery.getCurrent());
pageInfo.setList(page.getList() == null ? new ArrayList<>():page.getList());
pageInfo.setList(page.getList() == null ? new ArrayList<>() : page.getList());
pageInfo.setCount(page.getCount() == null ? 0 : page.getCount());
pageInfo.setPageSize(page.getPageSize() == null ? 0 : page.getPageSize());
return pageInfo;
@@ -801,25 +802,25 @@ public class WorkFlowController {
response.setContentType("application/force-download");
ExportParams exportParams = new ExportParams();
exportParams.setType(ExcelType.XSSF);
List<Map<String, Object>> list = workFlowFeignClient.get_list_by_instance(prcNum,null,null);
List<ProcessDetailExport> exportDatas=new ArrayList<>();
List<Map<String, Object>> list = workFlowFeignClient.get_list_by_instance(prcNum, null, null);
List<ProcessDetailExport> exportDatas = new ArrayList<>();
List<String> listId = Arrays.asList(idAndSartypeList.split(","));
for(Map<String, Object> map:list){
for(String id:listId){
if(id.equals(map.get("id").toString())){
if(map.get("endTime")!=null){
map.put("flag","已完成");
}else{
map.put("flag","未完成");
for (Map<String, Object> map : list) {
for (String id : listId) {
if (id.equals(map.get("id").toString())) {
if (map.get("endTime") != null) {
map.put("flag", "已完成");
} else {
map.put("flag", "未完成");
}
if(map.get("comment")!=null && !map.get("comment").toString().equals("")){
if (map.get("comment") != null && !map.get("comment").toString().equals("")) {
String comment = map.get("comment").toString();
switch (comment){
switch (comment) {
case "0":
map.put("comment","同意");
map.put("comment", "同意");
break;
case "1":
map.put("comment","不同意");
map.put("comment", "不同意");
break;
default:
}
@@ -846,56 +847,56 @@ public class WorkFlowController {
@ApiOperation(value = "强制撤回")
@GetMapping("/forceRecall")
public Wrapper<String> forceRecall(@RequestParam("prcId") String prcId){
public Wrapper<String> forceRecall(@RequestParam("prcId") String prcId) {
return workFlowFeignClient.forceRecall(prcId);
}
@ApiOperation(value = "流程分类列表")
@GetMapping("/categoryList")
public Wrapper<List<Category>> categoryList(){
public Wrapper<List<Category>> categoryList() {
return workFlowFeignClient.categoryList();
}
@ApiOperation(value = "添加流程分类")
@PostMapping("/addCategory")
public Wrapper<String> addCategory(@RequestBody Category category){
public Wrapper<String> addCategory(@RequestBody Category category) {
return workFlowFeignClient.addCategory(category);
}
@ApiOperation(value = "删除流程分类")
@GetMapping("/deleteCategory")
public Wrapper<String> deleteCategory(@RequestParam("objectId") String objectId){
public Wrapper<String> deleteCategory(@RequestParam("objectId") String objectId) {
return workFlowFeignClient.deleteCategory(objectId);
}
@ApiOperation(value = "编辑流程分类")
@PostMapping("/editCategory")
public Wrapper<String> editCategory(@RequestBody Category category){
public Wrapper<String> editCategory(@RequestBody Category category) {
return workFlowFeignClient.editCategory(category);
}
@ApiOperation(value = "查询流程")
@GetMapping("/modelListPage")
public Wrapper<Map<String, Object>> modelListPage(@RequestParam(value="name",required = false)String name, @RequestParam(value="category_id ",required = false)String category_id,
@RequestParam("current")int current, @RequestParam("size")int size){
return workFlowFeignClient.modelListPage(name,category_id,current,size);
public Wrapper<Map<String, Object>> modelListPage(@RequestParam(value = "name", required = false) String name, @RequestParam(value = "category_id ", required = false) String category_id,
@RequestParam("current") int current, @RequestParam("size") int size) {
return workFlowFeignClient.modelListPage(name, category_id, current, size);
}
@ApiOperation(value = "政策法规入库评估查看最后数据")
@GetMapping("/zcfgrkpgDetail")
public List<BusProcessNew> zcfgrkpgDetail(@RequestParam("pId") String pId){
public List<BusProcessNew> zcfgrkpgDetail(@RequestParam("pId") String pId) {
return workFlowFeignClient.zcfgrkpgDetail(pId);
}
@ApiOperation(value = "修改流程所属分类")
@GetMapping("/updatModel")
public Wrapper<String> updatModel(@RequestParam("modelId")String modelId, @RequestParam("categoryId")String categoryId){
return workFlowFeignClient.updatModel(modelId,categoryId);
public Wrapper<String> updatModel(@RequestParam("modelId") String modelId, @RequestParam("categoryId") String categoryId) {
return workFlowFeignClient.updatModel(modelId, categoryId);
}
@ApiOperation(value = "查询流程编号")
@GetMapping("/findPrcNumByPid")
public Wrapper<String> findPrcNumByPid(@RequestParam("pId")String pId){
public Wrapper<String> findPrcNumByPid(@RequestParam("pId") String pId) {
return workFlowFeignClient.findPrcNumByPid(pId);
}
@@ -907,8 +908,8 @@ public class WorkFlowController {
@ApiOperation(value = "标准解读流程汇总详情")
@GetMapping("/decodeDetail")
public BusProcessNew decodeDetail(@RequestParam("taskIds") String taskIds, @RequestParam("pId") String pId){
return workFlowFeignClient.decodeDetail(taskIds,pId);
public BusProcessNew decodeDetail(@RequestParam("taskIds") String taskIds, @RequestParam("pId") String pId) {
return workFlowFeignClient.decodeDetail(taskIds, pId);
}
@ApiOperation(value = "采购保存接口")
@@ -919,6 +920,7 @@ public class WorkFlowController {
@Autowired
ProcessTimer processTimer;
@ApiOperation(value = "自动催办，任务截至时间前3天开始每天催办")
@PostMapping("/send123")
public String send123() {
@@ -958,14 +960,14 @@ public class WorkFlowController {
@ApiOperation(value = "草稿删除")
@PostMapping("/delCG")
public String delCG(@RequestParam("id")String id){
public String delCG(@RequestParam("id") String id) {
return workFlowFeignClient.delCG(id);
}
@ApiOperation(value = "通过企标计划和技术标准起草关联表查询对应的计划id")
@GetMapping("/getEsByWk")
public String getEsByWk(@RequestParam("prcId")String prcId){
public String getEsByWk(@RequestParam("prcId") String prcId) {
return workFlowFeignClient.getEsByWk(prcId);
}
@@ -978,18 +980,14 @@ public class WorkFlowController {
@ApiOperation(value = "问答中心（第一个人回答以后删除其他人的代办任务以及OA提醒）")
@PostMapping("/deleteReplyToenNotice")
public List<BusProcessNew> deleteReplyToenNotice(@RequestParam("taskId") String taskId,@RequestParam("answerer") String answerer) {
return workFlowFeignClient.deleteReplyToenNotice(taskId,answerer);
public List<BusProcessNew> deleteReplyToenNotice(@RequestParam("taskId") String taskId, @RequestParam("answerer") String answerer) {
return workFlowFeignClient.deleteReplyToenNotice(taskId, answerer);
}
@ApiOperation(value = "问答中心（通过taskId获取提问Id）")
@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
+1 -2
View File
@@ -115,8 +115,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
//企业标准导出
addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStand/exportSarBussionessStand");
addInterceptor.excludePathPatterns("/api/lawss/sarFileSplitItems/exportTemplate");
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
+5
View File
@@ -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
+13
View File
@@ -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
+29
View File
@@ -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
+5 -5
View File
@@ -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);
if (esRevisePlans.size()>0){
return Result.success("企标名称不能重复,请更换新的企标名称");
}else {
// List<EsRevisePlan> esRevisePlans=esRevisePlanDao.selectPageByName(esRevisePlan);
// if (esRevisePlans.size()>0){
// return Result.success("企标名称不能重复,请更换新的企标名称");
// }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
+6
View File
@@ -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
+1
View File
@@ -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
+3
View File
@@ -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
+5
View File
@@ -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
+28 -2
View File
@@ -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){
return Result.error("当前企标标准号和企标名称已存在");
Integer valIdFlag = 0;
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
+1
View File
@@ -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
+4
View File
@@ -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
+100 -38
View File
@@ -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("企标编号");
sarBussStandAttrInfo.setStandNumber(standNumber);
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("起草部门");
if (StringUtils.isNotBlank(qcdw)) {
if (qcdw.length() > 100) {
return Result.error("第"+ count +"行输入的起草部门过长");
}
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)) {
if (qcrbuss.length() > 100) {
return Result.error("第"+ count +"行输入的起草人过长");
}
sarBussStandAttrInfo.setQcrbuss(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 + "(" + 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格式的附件");
return Result.error("第"+ 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格式的附件");
}
}
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格式的附件");
return Result.error("第"+ 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格式的附件");
}
}
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格式的附件");
return Result.error("第"+ 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格式的附件");
}
}
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格式的附件");
return Result.error("第"+ 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/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格式的附件");
return Result.error("第"+ 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格式的附件");
}
}
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格式的附件");
return Result.error("第"+ 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格式的附件");
}
}
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
+2
View File
@@ -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
+3
View File
@@ -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
+2 -2
View File
@@ -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
+4
View File
@@ -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
+1
View File
@@ -1254,4 +1254,5 @@
update sar_buss_stand_attr_info ss set ss.FBGBUSS = #{strFile}
where id = #{attfId}
</update>
</mapper>