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

企业编号 最大值 加1 以及新增时，企标名称可以重复（编号和名称重复也是新增一条，不做覆盖）

Browse Source
This commit is contained in:
gaojiabao
2023-04-04 11:44:31 +08:00
parent 9415f29898
commit c038fae038
9 changed files with 176 additions and 169 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
+6 -8
View File
@@ -153,11 +153,11 @@ 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 {
String agent = request.getHeader("User-Agent");
@@ -212,7 +212,6 @@ public class WorkFlowController {
}
@ApiOperation(value = "查询在线编辑流程汇总文件编辑对象")
@GetMapping("/processModelHisOneCount")
public BusProcessModelHis processModelHisOneCount(@RequestParam("pid") String pid) {
@@ -319,7 +318,6 @@ 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) {
@@ -332,6 +330,7 @@ public class WorkFlowController {
@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) {
@@ -473,6 +472,7 @@ public class WorkFlowController {
/**
* 复审流程使用
*
* @param busMes
* @return
*/
@@ -712,6 +712,7 @@ public class WorkFlowController {
/**
* 开始分页
*
* @param list
* @param pageNum 页码
* @param pageSize 每页多少条数据
@@ -919,6 +920,7 @@ public class WorkFlowController {
@Autowired
ProcessTimer processTimer;
@ApiOperation(value = "自动催办，任务截至时间前3天开始每天催办")
@PostMapping("/send123")
public String send123() {
@@ -986,10 +988,6 @@ 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/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
+4 -4
View File
@@ -163,9 +163,9 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
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 {
// 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/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/dao/SarBussionessStandDao.java
-1
View File
@@ -130,6 +130,5 @@ public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
@Select("select * from sar")
String setDtqbbhbuss(String dtqbbhbuss);
String selectMaxStandnSn();
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+1 -1
View File
@@ -4320,7 +4320,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
@Override
public ResponseMessage selectMaxStandnSn() {
String max = baseMapper.selectMaxStandnSn();
String max = iSarBussStandSnService.selectMaxStandnSn();
int maxIOnfo = 0;
if(StringUtils.isNotBlank(max)){
int i = Integer.parseInt(max);
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
-3
View File
@@ -1255,7 +1255,4 @@
where id = #{attfId}
</update>
<select id="selectMaxStandnSn" resultType="java.lang.String">
select Max(STAND_SN) from sar_bussioness_stand
</select>
</mapper>