yxk-20260520-党委会:新增议题序号字段

序号自动生成,明确生成逻辑(先选日期再选议题),20260520-1
This commit is contained in:
ye1023
2026-05-20 10:14:51 +08:00
parent 795e10adb9
commit 50dffa0829
2 changed files with 21 additions and 0 deletions
@@ -36,6 +36,7 @@ import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
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;
@@ -106,6 +107,7 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
if (oConvertUtils.isEmpty(bgPartymatter.getDelFlag())) {
bgPartymatter.setDelFlag("0");
}
fillGeneratedNumber(bgPartymatter);
bgPartymatterService.save(bgPartymatter);
return Result.OK("添加成功!");
}
@@ -120,6 +122,7 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
@RequiresPermissions("bgpartymatter:bg_partymatter:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody BgPartymatter bgPartymatter) {
fillGeneratedNumber(bgPartymatter);
bgPartymatterService.updateById(bgPartymatter);
return Result.OK("编辑成功!");
}
@@ -139,11 +142,24 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
return Result.error("流程实例ID不能为空");
}
String varField = oConvertUtils.isEmpty(dto.getVarField()) ? "json_data" : dto.getVarField();
fillGeneratedNumber(dto.getFormData());
bgPartymatterService.updateById(dto.getFormData());
runtimeService.setVariable(dto.getProcessInstanceId(), varField, JSONObject.toJSONString(dto.getFormData()));
return Result.OK("保存成功");
}
/**
* 根据会议时间和议题序号生成业务序号,规则: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删除
* @param id
@@ -66,6 +66,11 @@ public class BgPartymatter implements Serializable {
@Excel(name = "序号", width = 15)
@Schema(description = "序号")
private java.lang.String number;
/**议题序号*/
@Excel(name = "议题序号", width = 15)
@Schema(description = "议题序号")
@TableField("item_number")
private java.lang.Integer itemNumber;
/**会议时间*/
@Excel(name = "会议时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")