wsm-修改xispeak督办计划流程
This commit is contained in:
wsm
+11
@@ -169,4 +169,15 @@ public class BgXiSpeak implements Serializable {
|
||||
|
||||
@TableField(typeHandler = JacksonTypeHandler.class)
|
||||
private Map<String, DeptApproveDetail> approveInfo;
|
||||
|
||||
/**督办次数*/
|
||||
@Excel(name = "发起类型", width = 15)
|
||||
@Schema(description = "0收集后直接发起，1收集后按照反馈时间周期性发起")
|
||||
private java.lang.Integer launchType;
|
||||
|
||||
/**周期类型 1日 2周 3两周 4月 5季*/
|
||||
@Excel(name = "周期类型", width = 15)
|
||||
@Schema(description = "周期类型 1日 2周 3两周 4月 5季")
|
||||
private java.lang.Integer intervalType;
|
||||
|
||||
}
|
||||
|
||||
+84
-1
@@ -2,10 +2,14 @@ package org.jeecg.modules.bg.xispeak.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import java.util.Map;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
@@ -19,7 +23,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("bg_xi_speak_feedback")
|
||||
@TableName(value = "bg_xi_speak_feedback", autoResultMap = true)
|
||||
@Schema(description="习总书记重要讲话反馈表")
|
||||
public class BgXiSpeakFeedback implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
@@ -81,4 +85,83 @@ public class BgXiSpeakFeedback implements Serializable {
|
||||
@Excel(name = "外键", width = 15)
|
||||
@Schema(description = "外键")
|
||||
private java.lang.String mainId;
|
||||
|
||||
@Excel(name = "序号", width = 15)
|
||||
@Schema(description = "序号")
|
||||
private java.lang.Integer num;
|
||||
|
||||
/**措施内容*/
|
||||
@Excel(name = "措施内容", width = 15)
|
||||
@Schema(description = "措施内容")
|
||||
private java.lang.String method;
|
||||
|
||||
/**完成期限*/
|
||||
@Excel(name = "完成期限", width = 15, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "完成期限")
|
||||
private java.util.Date deadline;
|
||||
|
||||
/**成果形式*/
|
||||
@Excel(name = "成果形式", width = 15)
|
||||
@Schema(description = "成果形式")
|
||||
private java.lang.String outcomeForm;
|
||||
|
||||
/**进展情况*/
|
||||
@Excel(name = "进展情况", width = 15)
|
||||
@Schema(description = "进展情况")
|
||||
private java.lang.String progress;
|
||||
|
||||
|
||||
@Excel(name = "落实计划", width = 15)
|
||||
@Schema(description = "落实计划")
|
||||
private java.lang.String completionPlan;
|
||||
|
||||
@Excel(name = "总措施号", width = 15)
|
||||
@Schema(description = "总措施号")
|
||||
private java.lang.String sumMethodNum;
|
||||
|
||||
@Excel(name = "检查情况", width = 15)
|
||||
@Schema(description = "检查情况")
|
||||
private java.lang.String checkStatus;
|
||||
|
||||
@Excel(name = "监督意见", width = 15)
|
||||
@Schema(description = "监督意见")
|
||||
private java.lang.String inspectionAdvice;
|
||||
|
||||
@Excel(name = "措施数量", width = 15)
|
||||
@Schema(description = "措施数量")
|
||||
private java.lang.Integer measureNum;
|
||||
|
||||
/**流程引擎状态字段*/
|
||||
@Excel(name = "流程引擎状态字段", width = 15)
|
||||
@Schema(description = "流程引擎状态字段")
|
||||
private java.lang.Integer bpmStatus;
|
||||
|
||||
/**审批信息Map*/
|
||||
@TableField(typeHandler = JacksonTypeHandler.class)
|
||||
private Map<String, DeptApproveDetail> approveInfo;
|
||||
|
||||
// /**发起类型 0立即 1周期*/
|
||||
// @Excel(name = "发起类型 0立即 1周期", width = 15)
|
||||
// @Schema(description = "发起类型 0立即 1周期")
|
||||
// private java.lang.Integer launchType;
|
||||
//
|
||||
// /**周期类型 1日 2周 3两周 4月 5季*/
|
||||
// @Excel(name = "周期类型", width = 15)
|
||||
// @Schema(description = "周期类型 1日 2周 3两周 4月 5季")
|
||||
// private java.lang.Integer intervalType;
|
||||
//
|
||||
// /**周期任务数量*/
|
||||
// @Excel(name = "周期任务数量", width = 15)
|
||||
// @Schema(description = "周期任务数量")
|
||||
// private java.lang.Integer startCount;
|
||||
//
|
||||
// /**周期开始时间*/
|
||||
// @Excel(name = "周期开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
// @Schema(description = "周期开始时间")
|
||||
// private java.util.Date startTime;
|
||||
|
||||
}
|
||||
+7
@@ -11,4 +11,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
||||
*/
|
||||
public interface IBgXiSpeakFeedbackService extends IService<BgXiSpeakFeedback> {
|
||||
|
||||
/**
|
||||
* 使用行锁查询，确保数据一致性
|
||||
*
|
||||
* @param id 主键ID
|
||||
* @return 实体对象
|
||||
*/
|
||||
BgXiSpeakFeedback getByIdForUpdate(String id);
|
||||
}
|
||||
+7
@@ -1,5 +1,6 @@
|
||||
package org.jeecg.modules.bg.xispeak.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import org.jeecg.modules.bg.xispeak.entity.BgXiSpeakFeedback;
|
||||
import org.jeecg.modules.bg.xispeak.mapper.BgXiSpeakFeedbackMapper;
|
||||
import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakFeedbackService;
|
||||
@@ -16,4 +17,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
@Service
|
||||
public class BgXiSpeakFeedbackServiceImpl extends ServiceImpl<BgXiSpeakFeedbackMapper, BgXiSpeakFeedback> implements IBgXiSpeakFeedbackService {
|
||||
|
||||
@Override
|
||||
public BgXiSpeakFeedback getByIdForUpdate(String id) {
|
||||
return this.getOne(new LambdaQueryWrapper<BgXiSpeakFeedback>()
|
||||
.eq(BgXiSpeakFeedback::getId, id)
|
||||
.last("for update"));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user