!129 feat(sysuser): 新增按角色查询用户接口并使用优化版JOIN查询
* feat(sysuser): 新增按角色查询用户接口并使用优化版JOIN查询 * fix(bgpartymatter): 移除后端自动生成业务序号逻辑
This commit is contained in:
-16
@@ -49,7 +49,6 @@ import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
@@ -155,7 +154,6 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
|
||||
bgPartymatter.setBpmStatus("1");
|
||||
}
|
||||
fillDefaultMeetingTypeForCreate(bgPartymatter);
|
||||
fillGeneratedNumber(bgPartymatter);
|
||||
bgPartymatterService.save(bgPartymatter);
|
||||
return Result.OK("添加成功!");
|
||||
}
|
||||
@@ -172,7 +170,6 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
|
||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
||||
public Result<String> edit(@RequestBody BgPartymatter bgPartymatter) {
|
||||
fillMeetingTypeForUpdate(bgPartymatter);
|
||||
fillGeneratedNumber(bgPartymatter);
|
||||
bgPartymatterService.updateById(bgPartymatter);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
@@ -195,7 +192,6 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
|
||||
}
|
||||
String varField = oConvertUtils.isEmpty(dto.getVarField()) ? "json_data" : dto.getVarField();
|
||||
fillMeetingTypeForUpdate(dto.getFormData());
|
||||
fillGeneratedNumber(dto.getFormData());
|
||||
bgPartymatterService.saveBpmFormAndSyncVariable(dto.getFormData(), dto.getProcessInstanceId(), varField,
|
||||
JSONObject.toJSONString(dto.getFormData()));
|
||||
return Result.OK("保存成功");
|
||||
@@ -227,18 +223,6 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
|
||||
bgPartymatter.setMeetingType(BgPartymatterConstant.MeetingType.PARTY);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据会议时间和议题序号生成业务序号,规则:yyyyMMdd-议题序号。
|
||||
* 前端会即时回显,后端保存前再次生成,保证接口调用和流程保存数据一致。
|
||||
*/
|
||||
private void fillGeneratedNumber(BgPartymatter bgPartymatter) {
|
||||
if (bgPartymatter == null || bgPartymatter.getMatterTime() == null || bgPartymatter.getItemNumber() == null) {
|
||||
return;
|
||||
}
|
||||
String dateText = new SimpleDateFormat("yyyyMMdd").format(bgPartymatter.getMatterTime());
|
||||
bgPartymatter.setNumber(dateText + "-" + bgPartymatter.getItemNumber());
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user