Commit 3fa4040a authored by 廖旭伟's avatar 廖旭伟

修改事项申请材料添加方式,增加填单处理流程

parent 69e32feb
This diff is collapsed.
This diff is collapsed.
......@@ -156,6 +156,11 @@
<version>2.0.27</version>
</dependency>
<dependency>
<groupId>com.deepoove</groupId>
<artifactId>poi-tl</artifactId>
<version>1.12.0</version>
</dependency>
</dependencies>
......
......@@ -48,7 +48,9 @@ public class UploadServiceImpl implements UploadService {
if (tempFile == null || tempFile.getSize() == 0) {
throw new AppException("没有要上传的文件!");
}
if(StringUtils.isEmpty(prePath)){
prePath = "file/uploadfile";
}
String fileName = tempFile.getOriginalFilename();
String extension = FilenameUtils.getExtension(fileName);
UploadFileType type = UploadFileType.getFileType(extension);
......
......@@ -18,7 +18,8 @@ public enum ComponentEnum {
DATE("date", "日期选择栏"),
AREA("area", "区域选择栏"),
IMAGE("@image", "图片选择"),
DYNAMIC_TABLE("dt", "动态表格"),;
DYNAMIC_TABLE("dt", "动态表格"),
QRCODE("@qrcode", "二维码输入框");
private String value;
private String desc;
......
package com.mortals.xhx.common.formdesign;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import java.util.List;
@Data
public class CheckboxListItem extends ListItem {
@JSONField(name="value")
private List<String> value;
}
\ No newline at end of file
package com.mortals.xhx.common.formdesign;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import java.util.List;
@Data
public class ChildrenItem{
@JSONField(name="children")
private List<ChildrenItem> children;
@JSONField(name="label")
private String label;
@JSONField(name="value")
private String value;
}
\ No newline at end of file
package com.mortals.xhx.common.formdesign;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import java.util.List;
@Data
public class ColumnsItem {
@JSONField(name = "labelWidth")
private Integer labelWidth;
@JSONField(name = "rules")
private List<RulesItem> rules;
@JSONField(name = "compName")
private String compName;
@JSONField(name = "showLabel")
private Boolean showLabel;
@JSONField(name = "required")
private Boolean required;
@JSONField(name = "compType")
private String compType;
@JSONField(name = "type")
private String type;
@JSONField(name = "options")
private List<OptionsItem> options;
@JSONField(name = "action")
private String action;
@JSONField(name = "disabled")
private Boolean disabled;
@JSONField(name = "id")
private String id;
@JSONField(name = "placeholder")
private String placeholder;
@JSONField(name = "compIcon")
private String compIcon;
@JSONField(name = "value")
private String value;
@JSONField(name = "ele")
private String ele;
@JSONField(name = "filterable")
private Boolean filterable;
@JSONField(name = "clearable")
private Boolean clearable;
@JSONField(name = "plain")
private Boolean plain;
@JSONField(name = "round")
private Boolean round;
@JSONField(name = "circle")
private Boolean circle;
@JSONField(name = "loading")
private Boolean loading;
@JSONField(name = "icon")
private String icon;
@JSONField(name="range-separator")
private String rangeSeparator;
@JSONField(name="start-placeholder")
private String startPlaceholder;
@JSONField(name="end-placeholder")
private String endPlaceholder;
@JSONField(name="format")
private String format;
@JSONField(name="value-format")
private String valueFormat;
@JSONField(name = "dataType")
private String dataType;
@JSONField(name = "multiple")
private Boolean multiple;
@JSONField(name = "collapse-tags")
private Boolean collapseTags;
@JSONField(name = "label")
private String label;
@JSONField(name = "layout")
private String layout;
@JSONField(name = "gutter")
private Integer gutter;
@JSONField(name = "ruleError")
private String ruleError;
@JSONField(name = "viewType")
private String viewType;
@JSONField(name = "vertical")
private String vertical;
@JSONField(name = "text")
private String text;
@JSONField(name = "size")
private String size;
@JSONField(name = "optionType")
private String optionType;
@JSONField(name = "_id")
private String _id;
@JSONField(name = "config")
private Boolean config;
@JSONField(name = "border")
private Boolean border;
@JSONField(name = "show-word-limit")
private Boolean showWordLimit;
@JSONField(name = "maxLength")
private Integer maxLength;
@JSONField(name = "rows")
private Integer rows;
@JSONField(name = "span")
private Integer span;
@JSONField(name = "rulesType")
private String rulesType;
@JSONField(name = "prepend")
private String prepend;
@JSONField(name = "prefix-icon")
private String prefixIcon;
@JSONField(name = "readonly")
private Boolean readonly;
@JSONField(name = "suffix-icon")
private String suffixIcon;
@JSONField(name = "width")
private String width;
@JSONField(name = "append")
private String append;
@JSONField(name = "status")
private String status;
}
\ No newline at end of file
package com.mortals.xhx.common.formdesign;
import com.mortals.framework.exception.AppException;
import com.mortals.xhx.common.code.ComponentEnum;
import com.mortals.xhx.common.formdesign.component.*;
import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
public abstract class DesignComponent {
private String type;
public DesignComponent(String type) {
this.type = type;
}
public abstract ListItem buildDefaultComponent(ComponentCons cons);
public static DesignComponent createType(String type) {
if (type.equals(ComponentEnum.INPUT.getValue())) {
return new DesignInputComponent(type);
} else if (type.equals(ComponentEnum.TEXTAREA.getValue())) {
return new DesignTextAreaComponent(type);
} else if (type.equals(ComponentEnum.SELECT.getValue())) {
return new DesignSelectComponent(type);
} else if (type.equals(ComponentEnum.CHECKBOX.getValue())) {
return new DesignCheckboxComponent(type);
} else if (type.equals(ComponentEnum.RADIO.getValue())) {
return new DesignRadioComponent(type);
}else if (type.equals(ComponentEnum.BUTTON.getValue())) {
return new DesignButtonComponent(type);
} else if (type.equals(ComponentEnum.DATE.getValue())) {
return new DesignDateComponent(type);
} else if (type.equals(ComponentEnum.IMAGE.getValue())) {
return new DesignImageComponent(type);
} else if (type.equals(ComponentEnum.DYNAMIC_TABLE.getValue())) {
return new DesignDynamicTableComponent(type);
}
// else if (type.equals(ComponentEnum.AREA.getValue())) {
// return new AreaComponent(type);
// }
else if (type.equals(ComponentEnum.QRCODE.getValue())) {
return new DesignQrcodeComponent(type);
}
else {
throw new AppException(String.format("不支持当前组件类型,Type:%s", type));
}
}
public abstract String getType();
public static void main(String[] args) {
}
}
package com.mortals.xhx.common.formdesign;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
@Data
public class FormDesignConfig {
@JSONField(name="formRef")
private String formRef;
@JSONField(name="gutter")
private Integer gutter;
@JSONField(name="size")
private String size;
@JSONField(name="formRules")
private String formRules;
@JSONField(name="labelPosition")
private String labelPosition;
@JSONField(name="dynamicTableAllowed")
private Boolean dynamicTableAllowed;
@JSONField(name="rules")
private String rules;
@JSONField(name="labelWidth")
private Integer labelWidth;
@JSONField(name="disabled")
private Boolean disabled;
@JSONField(name="formModel")
private String formModel;
@JSONField(name="version")
private String version;
public void initAttribute() {
this.formRef = "elForm";
this.formModel="form";
this.rules="rules";
this.size = "medium";
this.labelPosition = "top";
this.labelWidth = 120;
this.formRules="rules";
this.gutter=15;
this.disabled = false;
this.dynamicTableAllowed=true;
this.version = "1.10";
}
}
\ No newline at end of file
package com.mortals.xhx.common.formdesign;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import java.util.List;
@Data
public class FormDesignRoot {
@JSONField(name = "list")
private List<ListItem> list;
@JSONField(name = "config")
private FormDesignConfig config;
}
\ No newline at end of file
package com.mortals.xhx.common.formdesign;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import java.util.List;
@Data
public class ListItem{
@JSONField(name="showIndex")
private Boolean showIndex;
@JSONField(name="visible")
private Boolean visible;
@JSONField(name="multiCheck")
private Boolean multiCheck;
@JSONField(name="columns")
private List<ColumnsItem> columns;
@JSONField(name="buttonDel")
private Boolean buttonDel;
@JSONField(name="labelWidth")
private Integer labelWidth;
@JSONField(name="summary-text")
private String summaryText;
@JSONField(name="compName")
private String compName;
@JSONField(name="showLabel")
private Boolean showLabel;
@JSONField(name="show-summary")
private Boolean showSummary;
@JSONField(name="layout")
private String layout;
@JSONField(name="compType")
private String compType;
@JSONField(name="id")
private String id;
@JSONField(name="_id")
private String _id;
@JSONField(name="compIcon")
private String compIcon;
@JSONField(name="config")
private Boolean config;
@JSONField(name="ele")
private String ele;
@JSONField(name="buttonAdd")
private Boolean buttonAdd;
@JSONField(name="sum-text")
private String sumText;
@JSONField(name="format")
private String format;
@JSONField(name="lineColor")
private String lineColor;
@JSONField(name="label")
private String label;
@JSONField(name="displayValue")
private Boolean displayValue;
@JSONField(name="form")
private Boolean form;
@JSONField(name="background")
private String background;
@JSONField(name="viewType")
private String viewType;
@JSONField(name="width")
private String width;
@JSONField(name="fontSize")
private Integer fontSize;
@JSONField(name="span")
private Integer span;
@JSONField(name="height")
private Integer height;
@JSONField(name="content-position")
private String contentPosition;
@JSONField(name="text")
private String text;
@JSONField(name="icon")
private String icon;
@JSONField(name="type")
private String type;
@JSONField(name="loading")
private Boolean loading;
@JSONField(name="size")
private String size;
@JSONField(name="round")
private Boolean round;
@JSONField(name="plain")
private Boolean plain;
@JSONField(name="disabled")
private Boolean disabled;
@JSONField(name="circle")
private Boolean circle;
@JSONField(name="closable")
private Boolean closable;
@JSONField(name="center")
private Boolean center;
@JSONField(name="description")
private String description;
@JSONField(name="title")
private String title;
@JSONField(name="show-icon")
private Boolean showIcon;
@JSONField(name="effect")
private String effect;
@JSONField(name="close-text")
private String closeText;
@JSONField(name="color")
private String color;
@JSONField(name="show")
private Boolean show;
@JSONField(name="bold")
private Integer bold;
@JSONField(name="align")
private String align;
@JSONField(name="underline")
private Boolean underline;
@JSONField(name="target")
private String target;
@JSONField(name="href")
private String href;
@JSONField(name="colConf")
private String colConf;
@JSONField(name="required")
private Boolean required;
@JSONField(name="multi")
private Boolean multi;
@JSONField(name="dval")
private String dval;
@JSONField(name="dlabel")
private String dlabel;
@JSONField(name="action")
private String action;
@JSONField(name="gutter")
private Integer gutter;
@JSONField(name="list-type")
private String listType;
@JSONField(name="tips")
private String tips;
@JSONField(name="show-file-list")
private Boolean showFileList;
@JSONField(name="buttonText")
private String buttonText;
@JSONField(name="showTip")
private Boolean showTip;
@JSONField(name="multiple")
private Boolean multiple;
@JSONField(name="accept")
private String accept;
@JSONField(name="fileSize")
private Integer fileSize;
@JSONField(name="name")
private String name;
@JSONField(name="dataType")
private String dataType;
@JSONField(name="props")
private Props props;
@JSONField(name="options")
private List<OptionsItem> options;
@JSONField(name="placeholder")
private String placeholder;
@JSONField(name="china-area-data")
private Boolean chinaAreaData;
@JSONField(name="color-format")
private String colorFormat;
@JSONField(name="show-alpha")
private Boolean showAlpha;
@JSONField(name="predefine")
private List<Object> predefine;
@JSONField(name="validateMaxText")
private Boolean validateMaxText;
@JSONField(name="max")
private Integer max;
@JSONField(name="customRules")
private List<RulesItem> customRules;
@JSONField(name="picker-options")
private PickerOptions pickerOptions;
@JSONField(name="rules")
private List<RulesItem> rules;
@JSONField(name="readonly")
private Boolean readonly;
@JSONField(name="arrow-control")
private Boolean arrowControl;
@JSONField(name="is-range")
private Boolean isRange;
@JSONField(name="clearable")
private Boolean clearable;
@JSONField(name="range-separator")
private String rangeSeparator;
@JSONField(name="value-format")
private String valueFormat;
@JSONField(name="maxLength")
private Integer maxLength;
@JSONField(name="start-placeholder")
private String startPlaceholder;
@JSONField(name="end-placeholder")
private String endPlaceholder;
@JSONField(name="show-score")
private Boolean showScore;
@JSONField(name="allow-half")
private Boolean allowHalf;
@JSONField(name="show-stops")
private Boolean showStops;
@JSONField(name="range")
private Boolean range;
@JSONField(name="show-tooltip")
private Boolean showTooltip;
@JSONField(name="min")
private Integer min;
@JSONField(name="step")
private Integer step;
@JSONField(name="maxlength")
private Integer maxlength;
@JSONField(name="rows")
private Integer rows;
@JSONField(name="ruleError")
private String ruleError;
@JSONField(name="show-word-limit")
private Boolean showWordLimit;
@JSONField(name="status")
private String status;
@JSONField(name="step-strictly")
private Boolean stepStrictly;
@JSONField(name="precision")
private Integer precision;
@JSONField(name="controls-position")
private String controlsPosition;
@JSONField(name="regList")
private List<Object> regList;
@JSONField(name="inactive-color")
private String inactiveColor;
@JSONField(name="active-color")
private String activeColor;
@JSONField(name="active-value")
private String activeValue;
@JSONField(name="inactive-value")
private String inactiveValue;
@JSONField(name="vertical")
private Boolean vertical;
@JSONField(name="optionType")
private String optionType;
@JSONField(name="border")
private Boolean border;
@JSONField(name="filterable")
private Boolean filterable;
@JSONField(name="collapse-tags")
private Boolean collapseTags;
@JSONField(name="rulesType")
private String rulesType;
@JSONField(name="prepend")
private String prepend;
@JSONField(name="prefix-icon")
private String prefixIcon;
@JSONField(name="suffix-icon")
private String suffixIcon;
@JSONField(name="append")
private String append;
@JSONField(name="rowCount")
private Integer rowCount;
@JSONField(name="limit")
private Integer limit;
@JSONField(name="value")
private Object value;
}
\ No newline at end of file
package com.mortals.xhx.common.formdesign;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import java.util.List;
@Data
public class OptionsItem{
@JSONField(name="label")
private String label;
@JSONField(name="value")
private String value;
@JSONField(name="disabled")
private Boolean disabled;
@JSONField(name="children")
private List<ChildrenItem> children;
}
\ No newline at end of file
package com.mortals.xhx.common.formdesign;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
@Data
public class PickerOptions {
@JSONField(name = "selectableRange")
private String selectableRange;
}
\ No newline at end of file
package com.mortals.xhx.common.formdesign;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
@Data
public class Props{
@JSONField(name="filterable")
private Boolean filterable;
@JSONField(name="clearable")
private Boolean clearable;
@JSONField(name="show-all-levels")
private Boolean showAllLevels;
@JSONField(name="separator")
private String separator;
@JSONField(name="props")
private Props props;
@JSONField(name="children")
private String children;
@JSONField(name="multiple")
private Boolean multiple;
@JSONField(name="checkStrictly")
private Boolean checkStrictly;
@JSONField(name="label")
private String label;
@JSONField(name="expandTrigger")
private String expandTrigger;
@JSONField(name="value")
private String value;
}
\ No newline at end of file
package com.mortals.xhx.common.formdesign;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
@Data
public class RulesItem {
@JSONField(name="msg")
private String msg;
@JSONField(name="rule")
private String rule;
}
\ No newline at end of file
package com.mortals.xhx.common.formdesign;
import lombok.Data;
/**
* 表格组件
*
* @author:
* @date: 2022/9/19 15:53
*/
@Data
public class TableColItem {
private String val;
private String label;
/**
* 列类型
*/
private String colType;
}
package com.mortals.xhx.common.formdesign.component;
import com.mortals.xhx.common.code.ComponentEnum;
import com.mortals.xhx.common.formdesign.DesignComponent;
import com.mortals.xhx.common.formdesign.ListItem;
import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
/**
* 按钮组件
*
* @author: zxfei
* @date: 2021/10/26 10:35
* @description:
**/
public class DesignButtonComponent extends DesignComponent {
public DesignButtonComponent(String type) {
super(type);
}
@Override
public ListItem buildDefaultComponent(ComponentCons cons) {
ListItem columnsItem = new ListItem();
columnsItem.setId(cons.getVal());
columnsItem.set_id(cons.getVal());
columnsItem.setCompType("button");
columnsItem.setCompName(cons.getLabel());
columnsItem.setCompIcon("button");
columnsItem.setEle("el-button");
columnsItem.setViewType("component");
columnsItem.setConfig(true);
columnsItem.setShowLabel(true);
columnsItem.setLabel(cons.getLabel());
columnsItem.setLabelWidth(120);
columnsItem.setType("primary");
columnsItem.setText("按钮");
columnsItem.setPlain(true);
columnsItem.setRound(false);
columnsItem.setCircle(false);
columnsItem.setLoading(false);
columnsItem.setLayout("colItem");
return columnsItem;
}
@Override
public String getType() {
return ComponentEnum.BUTTON.getValue();
}
}
package com.mortals.xhx.common.formdesign.component;
import cn.hutool.core.util.StrUtil;
import com.google.common.collect.Lists;
import com.mortals.xhx.common.code.ComponentEnum;
import com.mortals.xhx.common.formdesign.CheckboxListItem;
import com.mortals.xhx.common.formdesign.DesignComponent;
import com.mortals.xhx.common.formdesign.ListItem;
import com.mortals.xhx.common.formdesign.OptionsItem;
import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
import com.mortals.xhx.common.utils.StringUtils;
import org.springframework.util.ObjectUtils;
import java.util.List;
import java.util.stream.Collectors;
/**
* 复选框组件
*
* @author: zxfei
* @date: 2021/10/26 10:35
* @description:
**/
public class DesignCheckboxComponent extends DesignComponent {
public DesignCheckboxComponent(String type) {
super(type);
}
@Override
public ListItem buildDefaultComponent(ComponentCons cons) {
CheckboxListItem columnsItem = new CheckboxListItem();
columnsItem.setId(cons.getVal());
columnsItem.set_id(cons.getVal());
columnsItem.setCompType("checkbox");
columnsItem.setCompName(cons.getLabel());
columnsItem.setCompIcon("checkbox");
columnsItem.setEle("el-checkbox-group");
columnsItem.setViewType("component");
columnsItem.setConfig(true);
columnsItem.setShowLabel(true);
columnsItem.setLabel(cons.getLabel());
columnsItem.setLabelWidth(120);
columnsItem.setPlaceholder("请输入"+cons.getLabel());
columnsItem.setMaxLength(50);
columnsItem.setRequired(true);
columnsItem.setMultiple(false);
columnsItem.setCollapseTags(false);
columnsItem.setDisabled(false);
columnsItem.setBorder(false);
columnsItem.setSize("medium");
columnsItem.setGutter(15);
columnsItem.setSpan(24);
columnsItem.setOptionType("default");
columnsItem.setDataType("static");
columnsItem.setAction("https://www.fastmock.site/mock/51715c0157535b99010bde55f2df33c8/formDesigner/api/options");
columnsItem.setClearable(false);
columnsItem.setValue(Lists.newArrayList());
columnsItem.setRules(Lists.newArrayList());
columnsItem.setLayout("colItem");
columnsItem.setRuleError("该字段不能为空");
columnsItem.setRulesType("default");
initDefaultCheckBoxValue(cons, columnsItem);
return columnsItem;
}
/**
* 值格式 *党员-非党员-群众*
* @param cons
* @param columnsItem
*/
private void initDefaultCheckBoxValue(ComponentCons cons, ListItem columnsItem) {
if (cons.getVal().indexOf("<") != -1) {
String cks = StringUtils.substringBetween(cons.getVal(), "<", ">");
if(ObjectUtils.isEmpty(cks))return;
List<OptionsItem> optionsItemList = StrUtil.splitTrim(cks, "-", -1).stream().map(option -> {
OptionsItem options = new OptionsItem();
options.setLabel(option);
options.setValue(option);
return options;
}).collect(Collectors.toList());
columnsItem.setOptions(optionsItemList);
}
}
@Override
public String getType() {
return ComponentEnum.CHECKBOX.getValue();
}
}
package com.mortals.xhx.common.formdesign.component;
import com.mortals.xhx.common.code.ComponentEnum;
import com.mortals.xhx.common.formdesign.DesignComponent;
import com.mortals.xhx.common.formdesign.ListItem;
import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
/**
* 时间组件
*
* @author: zxfei
* @date: 2021/10/26 10:35
* @description:
**/
public class DesignDateComponent extends DesignComponent {
public DesignDateComponent(String type) {
super(type);
}
@Override
public ListItem buildDefaultComponent(ComponentCons cons) {
ListItem columnsItem = new ListItem();
columnsItem.setId(cons.getVal());
columnsItem.set_id(cons.getVal());
columnsItem.setCompType("date");
columnsItem.setEle("el-date-picker");
columnsItem.setCompName(cons.getLabel());
columnsItem.setCompIcon("date");
columnsItem.setViewType("text");
columnsItem.setConfig(true);
columnsItem.setShowLabel(true);
columnsItem.setLabel(cons.getLabel());
columnsItem.setLabelWidth(120);
columnsItem.setType("date");
columnsItem.setPlaceholder("请选择" + cons.getLabel());
columnsItem.setRequired(true);
columnsItem.setMaxLength(50);
columnsItem.setGutter(15);
columnsItem.setSpan(24);
columnsItem.setFormat("yyyy 年 MM 月 dd 日");
columnsItem.setValueFormat("yyyy 年 MM 月 dd 日");
columnsItem.setLayout("colItem");
return columnsItem;
}
@Override
public String getType() {
return ComponentEnum.DATE.getValue();
}
}
package com.mortals.xhx.common.formdesign.component;
import com.google.common.collect.Lists;
import com.mortals.xhx.common.code.ComponentEnum;
import com.mortals.xhx.common.formdesign.ColumnsItem;
import com.mortals.xhx.common.formdesign.DesignComponent;
import com.mortals.xhx.common.formdesign.ListItem;
import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
import org.springframework.util.ObjectUtils;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
/**
* 动态表格组件
*
* @author: zxfei
* @date: 2021/10/26 10:35
* @description:
**/
public class DesignDynamicTableComponent extends DesignComponent {
public DesignDynamicTableComponent(String type) {
super(type);
}
@Override
public ListItem buildDefaultComponent(ComponentCons cons) {
ListItem listItem = new ListItem();
listItem.setId(cons.getVal());
listItem.set_id(cons.getVal());
listItem.setCompType("dynamicTable");
listItem.setEle("dynamic-table");
listItem.setCompName("动态表格");
listItem.setLayout("dynamicItem");
listItem.setCompIcon("table");
listItem.setLabelWidth(0);
listItem.setShowLabel(false);
listItem.setConfig(true);
listItem.setButtonAdd(true);
listItem.setButtonDel(true);
listItem.setShowIndex(true);
listItem.setVisible(true);
listItem.setMultiCheck(false);
listItem.setShowSummary(false);
listItem.setSumText("合计");
listItem.setSummaryText("元");
listItem.setRowCount(3);
if (!ObjectUtils.isEmpty(cons.getColList())) {
//动态生成列元素
List<ColumnsItem> columnsItemList = cons.getColList().stream().map(item -> {
ColumnsItem columnsItem = new ColumnsItem();
if (item.getColType().equals(ComponentEnum.INPUT.getValue())) {
//创建输入框出初始值
columnsItem.setId(item.getVal());
columnsItem.set_id(item.getVal());
columnsItem.setCompType("input");
columnsItem.setCompName("单行文本");
columnsItem.setCompIcon("input");
columnsItem.setViewType("text");
columnsItem.setEle("el-input");
columnsItem.setConfig(true);
columnsItem.setShowLabel(true);
columnsItem.setLabel(item.getLabel());
columnsItem.setLabelWidth(120);
columnsItem.setPlaceholder("请输入" + item.getLabel());
columnsItem.setRequired(true);
columnsItem.setMaxLength(50);
columnsItem.setGutter(15);
columnsItem.setSpan(24);
columnsItem.setWidth("100%");
columnsItem.setClearable(true);
columnsItem.setDisabled(false);
columnsItem.setReadonly(false);
columnsItem.setStatus("normal");
columnsItem.setPrefixIcon("");
columnsItem.setSuffixIcon("");
columnsItem.setValue("");
columnsItem.setRules(Lists.newArrayList());
columnsItem.setRulesType("default");
columnsItem.setAppend("");
columnsItem.setPrepend("");
columnsItem.setLayout("colItem");
}else if(item.getColType().equals(ComponentEnum.TEXTAREA.getValue())){
columnsItem.setId(item.getVal());
columnsItem.set_id(item.getVal());
columnsItem.setCompType("textarea");
columnsItem.setEle("el-input");
columnsItem.setCompName("多行文本");
columnsItem.setCompIcon("textarea");
columnsItem.setViewType("text");
columnsItem.setType("textarea");
columnsItem.setConfig(true);
columnsItem.setShowLabel(true);
columnsItem.setLabel(item.getLabel());
columnsItem.setLabelWidth(120);
columnsItem.setPlaceholder("请输入" + item.getLabel());
columnsItem.setRequired(true);
columnsItem.setMaxLength(200);
columnsItem.setShowWordLimit(true);
columnsItem.setGutter(15);
columnsItem.setSpan(24);
columnsItem.setClearable(true);
columnsItem.setDisabled(false);
columnsItem.setReadonly(false);
columnsItem.setRows(4);
columnsItem.setStatus("normal");
columnsItem.setValue(""); //设置默认值
columnsItem.setRules(Lists.newArrayList());
columnsItem.setRuleError("该字段不能为空");
columnsItem.setRulesType("default");
columnsItem.setLayout("colItem");
}else if(item.getColType().equals(ComponentEnum.DATE.getValue())){
columnsItem.setId(item.getVal());
columnsItem.set_id(item.getVal());
columnsItem.setCompType("date");
columnsItem.setEle("el-date-picker");
columnsItem.setCompName("日期");
columnsItem.setCompIcon("date");
columnsItem.setViewType("text");
columnsItem.setConfig(true);
columnsItem.setShowLabel(true);
columnsItem.setLabel(item.getLabel());
columnsItem.setLabelWidth(120);
columnsItem.setType("date");
columnsItem.setPlaceholder("请选择" + item.getLabel());
columnsItem.setRequired(true);
columnsItem.setMaxLength(50);
columnsItem.setGutter(15);
columnsItem.setSpan(24);
columnsItem.setValue("");
columnsItem.setClearable(true);
columnsItem.setDisabled(false);
columnsItem.setReadonly(false);
columnsItem.setRules(Collections.emptyList());
// columnsItem.setRangeSeparator("-");
// columnsItem.setFormat("yyyy-MM-dd");
// columnsItem.setValueFormat("yyyy-MM-dd");
columnsItem.setRangeSeparator(" ");
columnsItem.setFormat("yyyy 年 MM 月 dd 日");
columnsItem.setValueFormat("yyyy 年 MM 月 dd 日");
columnsItem.setStartPlaceholder("开始日期");
columnsItem.setEndPlaceholder("结束日期");
columnsItem.setLayout("colItem");
}
return columnsItem;
}).collect(Collectors.toList());
listItem.setColumns(columnsItemList);
}
return listItem;
}
@Override
public String getType() {
return ComponentEnum.DYNAMIC_TABLE.getValue();
}
}
package com.mortals.xhx.common.formdesign.component;
import com.mortals.xhx.common.code.ComponentEnum;
import com.mortals.xhx.common.formdesign.DesignComponent;
import com.mortals.xhx.common.formdesign.ListItem;
import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
/**
* 图片组件
*
* @author: zxfei
* @date: 2021/10/26 10:35
* @description:
**/
public class DesignImageComponent extends DesignComponent {
public DesignImageComponent(String type) {
super(type);
}
@Override
public ListItem buildDefaultComponent(ComponentCons cons) {
ListItem columnsItem = new ListItem();
columnsItem.setId(cons.getVal());
columnsItem.set_id(cons.getVal());
columnsItem.setCompType("upload");
columnsItem.setCompName("附件");
columnsItem.setCompIcon("att");
columnsItem.setEle("el-upload");
columnsItem.setViewType("component");
columnsItem.setConfig(true);
columnsItem.setShowLabel(true);
columnsItem.setLabel(cons.getLabel());
columnsItem.setLabelWidth(120);
columnsItem.setMultiple(false);
columnsItem.setRequired(true);
columnsItem.setAction(cons.getUploadFileUrl());
columnsItem.setName("file");
columnsItem.setShowFileList(true);
columnsItem.setListType("picture-card");
columnsItem.setShowTip(false);
columnsItem.setTips("点击按钮上传附件");
columnsItem.setAccept("jpg,png,jpeg,bmp");
columnsItem.setFileSize(10);//文件大 小单位M
columnsItem.setLimit(1); //文件个数
columnsItem.setLayout("colItem");
return columnsItem;
/* //图片选择
FieldsItem fieldsItem = new FieldsItem();
Config config = new Config();
config.setLabel("日期选择");
config.setTag("el-upload");
config.setTagIcon("upload");
config.setButtonText("点击上传");
config.setFileSize(2);
config.setSizeUnit("MB");
config.setLabelWidth("");
config.setShowLabel(true);
config.setChangeTag(true);
config.setTag("el-upload");
config.setRequired(false);
config.setLayout("colFormItem");
config.setDocument("https://element.eleme.cn/#/zh-CN/component/upload");
config.setRegList(new ArrayList<>());
config.setSpan(12);
fieldsItem.setConfig(config);
Slot slot = new Slot();
slot.setListType(true);
fieldsItem.setSlot(slot);
fieldsItem.setAction("/m/file/commonupload?prePath=preview");
fieldsItem.setAccept("image/*");
fieldsItem.setName("file");
fieldsItem.setAutoUpload(true);
fieldsItem.setListType("picture-card");
fieldsItem.setMultiple(false);
fieldsItem.setClearable(true);
fieldsItem.setReadonly(false);
fieldsItem.setDisabled(false);
fieldsItem.setVModel("imageupload");
return fieldsItem;*/
}
@Override
public String getType() {
return ComponentEnum.IMAGE.getValue();
}
}
package com.mortals.xhx.common.formdesign.component;
import com.google.common.collect.Lists;
import com.mortals.xhx.common.code.ComponentEnum;
import com.mortals.xhx.common.formdesign.DesignComponent;
import com.mortals.xhx.common.formdesign.ListItem;
import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
/**
* 输入框组件
*
* @author: zxfei
* @date: 2021/10/26 10:35
* @description:
**/
public class DesignInputComponent extends DesignComponent {
public DesignInputComponent(String type) {
super(type);
}
@Override
public ListItem buildDefaultComponent(ComponentCons cons) {
ListItem columnsItem = new ListItem();
columnsItem.setId(cons.getVal());
columnsItem.set_id(cons.getVal());
columnsItem.setCompType("input");
columnsItem.setCompName(cons.getLabel());
columnsItem.setCompIcon("input");
columnsItem.setEle("el-input");
columnsItem.setViewType("text");
columnsItem.setConfig(true);
columnsItem.setShowLabel(true);
columnsItem.setLabel(cons.getLabel());
columnsItem.setLabelWidth(120);
columnsItem.setPlaceholder("请输入"+cons.getLabel());
columnsItem.setRequired(true);
columnsItem.setMaxLength(50);
columnsItem.setGutter(15);
columnsItem.setSpan(24);
columnsItem.setWidth("100%");
columnsItem.setClearable(true);
columnsItem.setDisabled(false);
columnsItem.setReadonly(false);
columnsItem.setStatus("normal");
columnsItem.setPrefixIcon("");
columnsItem.setRules(Lists.newArrayList());
columnsItem.setRulesType("default");
columnsItem.setAppend("");
columnsItem.setPrepend("");
columnsItem.setLayout("colItem");
return columnsItem;
}
@Override
public String getType() {
return ComponentEnum.INPUT.getValue();
}
}
package com.mortals.xhx.common.formdesign.component;
import com.google.common.collect.Lists;
import com.mortals.xhx.common.code.ComponentEnum;
import com.mortals.xhx.common.formdesign.DesignComponent;
import com.mortals.xhx.common.formdesign.ListItem;
import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
/**
* 二维码输入框
*/
public class DesignQrcodeComponent extends DesignComponent {
public DesignQrcodeComponent(String type) {
super(type);
}
@Override
public ListItem buildDefaultComponent(ComponentCons cons) {
ListItem columnsItem = new ListItem();
columnsItem.setId(cons.getVal());
columnsItem.set_id(cons.getVal());
columnsItem.setCompType("textarea");
columnsItem.setEle("el-input");
columnsItem.setCompName("多行文本");
columnsItem.setCompIcon("textarea");
columnsItem.setViewType("text");
columnsItem.setType("textarea");
columnsItem.setConfig(true);
columnsItem.setShowLabel(true);
columnsItem.setLabel(cons.getLabel());
columnsItem.setLabelWidth(120);
columnsItem.setPlaceholder("请输入" + cons.getLabel());
columnsItem.setRequired(true);
columnsItem.setMaxLength(200);
columnsItem.setShowWordLimit(true);
columnsItem.setGutter(15);
columnsItem.setSpan(24);
columnsItem.setClearable(true);
columnsItem.setDisabled(false);
columnsItem.setReadonly(false);
columnsItem.setRows(4);
columnsItem.setStatus("normal");
//设置默认值
columnsItem.setRules(Lists.newArrayList());
columnsItem.setRuleError("该字段不能为空");
columnsItem.setRulesType("default");
columnsItem.setLayout("colItem");
return columnsItem;
}
@Override
public String getType() {
return ComponentEnum.QRCODE.getValue();
}
}
package com.mortals.xhx.common.formdesign.component;
import cn.hutool.core.util.StrUtil;
import com.google.common.collect.Lists;
import com.mortals.xhx.common.code.ComponentEnum;
import com.mortals.xhx.common.formdesign.DesignComponent;
import com.mortals.xhx.common.formdesign.ListItem;
import com.mortals.xhx.common.formdesign.OptionsItem;
import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
import com.mortals.xhx.common.utils.StringUtils;
import org.springframework.util.ObjectUtils;
import java.util.List;
import java.util.stream.Collectors;
/**
* 复选框组件
*
* @author: zxfei
* @date: 2021/10/26 10:35
* @description:
**/
public class DesignRadioComponent extends DesignComponent {
public DesignRadioComponent(String type) {
super(type);
}
@Override
public ListItem buildDefaultComponent(ComponentCons cons) {
ListItem columnsItem = new ListItem();
columnsItem.setId(cons.getVal());
columnsItem.set_id(cons.getVal());
columnsItem.setCompType("radio");
columnsItem.setCompName(cons.getLabel());
columnsItem.setCompIcon("radio");
columnsItem.setEle("el-radio-group");
columnsItem.setViewType("component");
columnsItem.setConfig(true);
columnsItem.setShowLabel(true);
columnsItem.setLabel(cons.getLabel());
columnsItem.setLabelWidth(120);
columnsItem.setPlaceholder("请输入"+cons.getLabel());
columnsItem.setMaxLength(50);
columnsItem.setRequired(true);
columnsItem.setDisabled(false);
columnsItem.setBorder(false);
columnsItem.setSize("medium");
columnsItem.setGutter(15);
columnsItem.setSpan(24);
columnsItem.setOptionType("default");
columnsItem.setDataType("static");
columnsItem.setAction("https://www.fastmock.site/mock/51715c0157535b99010bde55f2df33c8/formDesigner/api/options");
columnsItem.setClearable(false);
columnsItem.setRules(Lists.newArrayList());
columnsItem.setLayout("colItem");
columnsItem.setRuleError("该字段不能为空");
columnsItem.setRulesType("default");
initDefaultRadioValue(cons, columnsItem);
return columnsItem;
}
private void initDefaultRadioValue(ComponentCons cons, ListItem columnsItem) {
if (cons.getVal().indexOf("<") != -1) {
String cks = StringUtils.substringBetween(cons.getVal(), "<", ">");
if(ObjectUtils.isEmpty(cks))return;
List<OptionsItem> optionsItemList = StrUtil.splitTrim(cks, "-", -1).stream().map(option -> {
OptionsItem options = new OptionsItem();
options.setLabel(option);
options.setValue(option);
return options;
}).collect(Collectors.toList());
columnsItem.setOptions(optionsItemList);
}
}
@Override
public String getType() {
return ComponentEnum.RADIO.getValue();
}
}
package com.mortals.xhx.common.formdesign.component;
import cn.hutool.core.util.StrUtil;
import com.google.common.collect.Lists;
import com.mortals.xhx.common.code.ComponentEnum;
import com.mortals.xhx.common.formdesign.DesignComponent;
import com.mortals.xhx.common.formdesign.ListItem;
import com.mortals.xhx.common.formdesign.OptionsItem;
import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
import com.mortals.xhx.common.utils.StringUtils;
import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* 下拉框组件
*
* @author: zxfei
* @date: 2021/10/26 10:35
* @description:
**/
public class DesignSelectComponent extends DesignComponent {
public DesignSelectComponent(String type) {
super(type);
}
@Override
public ListItem buildDefaultComponent(ComponentCons cons) {
ListItem columnsItem = new ListItem();
columnsItem.setId(cons.getVal());
columnsItem.set_id(cons.getVal());
columnsItem.setCompType("select");
columnsItem.setCompName(cons.getLabel());
columnsItem.setCompIcon("select");
columnsItem.setEle("el-select");
columnsItem.setViewType("component");
columnsItem.setConfig(true);
columnsItem.setShowLabel(true);
columnsItem.setLabel(cons.getLabel());
columnsItem.setLabelWidth(120);
columnsItem.setPlaceholder("请输入"+cons.getLabel());
columnsItem.setMaxLength(50);
columnsItem.setRequired(true);
columnsItem.setMultiple(false);
columnsItem.setCollapseTags(false);
columnsItem.setDisabled(false);
columnsItem.setGutter(15);
columnsItem.setSpan(24);
columnsItem.setDataType("static");
columnsItem.setAction("https://www.fastmock.site/mock/51715c0157535b99010bde55f2df33c8/formDesigner/api/options");
columnsItem.setClearable(false);
columnsItem.setRules(Lists.newArrayList());
columnsItem.setLayout("colItem");
columnsItem.setRuleError("该字段不能为空");
columnsItem.setRulesType("default");
initDefaultSelectValue(cons, columnsItem);
return columnsItem;
}
private void initDefaultSelectValue(ComponentCons cons, ListItem columnsItem) {
//判断如果包含年,月,日,选项框 基础化
if (cons.getVal().indexOf("年") != -1) {
//初始化10年
List<OptionsItem> optionsItems = initYears();
columnsItem.setOptions(optionsItems);
} else if (cons.getVal().indexOf("月") != -1) {
List<OptionsItem> optionsItems = initMonths();
columnsItem.setOptions(optionsItems);
} else if (cons.getVal().indexOf("日") != -1) {
List<OptionsItem> optionsItems = initDays();
columnsItem.setOptions(optionsItems);
}
if (cons.getVal().indexOf("<") != -1) {
String cks = StringUtils.substringBetween(cons.getVal(), "<", ">");
if(ObjectUtils.isEmpty(cks))return;
List<OptionsItem> optionsItemList = StrUtil.splitTrim(cks, "-", -1).stream().map(option -> {
OptionsItem options = new OptionsItem();
options.setLabel(option);
options.setValue(option);
return options;
}).collect(Collectors.toList());
columnsItem.setOptions(optionsItemList);
// cons.setVal(cons.getVal().substring(0, cons.getVal().indexOf("[")));
// cons.setLabel(cons.getLabel().substring(0, cons.getLabel().indexOf("[")));
}
}
public List<OptionsItem> initYears() {
List<OptionsItem> list = new ArrayList<>();
for (int i = 2020; i < 2030; i++) {
OptionsItem optionsItem = new OptionsItem();
optionsItem.setLabel(i + "");
optionsItem.setValue(i + "");
list.add(optionsItem);
}
return list;
}
public List<OptionsItem> initMonths() {
List<OptionsItem> list = new ArrayList<>();
for (int i = 1; i <= 12; i++) {
OptionsItem optionsItem = new OptionsItem();
optionsItem.setLabel(i + "");
optionsItem.setValue(i + "");
list.add(optionsItem);
}
return list;
}
public List<OptionsItem> initDays() {
List<OptionsItem> list = new ArrayList<>();
for (int i = 1; i <= 31; i++) {
OptionsItem optionsItem = new OptionsItem();
optionsItem.setLabel(i + "");
optionsItem.setValue(i + "");
list.add(optionsItem);
}
return list;
}
@Override
public String getType() {
return ComponentEnum.SELECT.getValue();
}
}
package com.mortals.xhx.common.formdesign.component;
import com.google.common.collect.Lists;
import com.mortals.xhx.common.code.ComponentEnum;
import com.mortals.xhx.common.formdesign.DesignComponent;
import com.mortals.xhx.common.formdesign.ListItem;
import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
/**
* 文本域组件
*
* @author: zxfei
* @date: 2021/10/26 10:35
* @description:
**/
public class DesignTextAreaComponent extends DesignComponent {
public DesignTextAreaComponent(String type) {
super(type);
}
@Override
public ListItem buildDefaultComponent(ComponentCons cons) {
ListItem columnsItem = new ListItem();
columnsItem.setId(cons.getVal());
columnsItem.set_id(cons.getVal());
columnsItem.setCompType("textarea");
columnsItem.setEle("el-input");
columnsItem.setCompName("多行文本");
columnsItem.setCompIcon("textarea");
columnsItem.setViewType("text");
columnsItem.setType("textarea");
columnsItem.setConfig(true);
columnsItem.setShowLabel(true);
columnsItem.setLabel(cons.getLabel());
columnsItem.setLabelWidth(120);
columnsItem.setPlaceholder("请输入" + cons.getLabel());
columnsItem.setRequired(true);
columnsItem.setMaxLength(200);
columnsItem.setShowWordLimit(true);
columnsItem.setGutter(15);
columnsItem.setSpan(24);
columnsItem.setClearable(true);
columnsItem.setDisabled(false);
columnsItem.setReadonly(false);
columnsItem.setRows(4);
columnsItem.setStatus("normal");
//设置默认值
columnsItem.setRules(Lists.newArrayList());
columnsItem.setRuleError("该字段不能为空");
columnsItem.setRulesType("default");
columnsItem.setLayout("colItem");
return columnsItem;
}
@Override
public String getType() {
return ComponentEnum.TEXTAREA.getValue();
}
}
package com.mortals.xhx.common.pdu.gen.component;
import com.mortals.xhx.common.formdesign.TableColItem;
import com.mortals.xhx.common.pdu.NodeEntity;
import lombok.Data;
import org.w3c.dom.Document;
......@@ -26,7 +27,8 @@ public class ComponentCons {
private Document document;
private String uploadFileUrl;
private List<TableColItem> colList;
private String uploadFileUrl;
}
package com.mortals.xhx.module.matter.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.matter.model.UserMatterApplyEntity;
import java.util.List;
/**
* 用户申报信息Dao
* 用户申报信息 DAO接口
*
* @author zxfei
* @date 2023-04-10
*/
public interface UserMatterApplyDao extends ICRUDDao<UserMatterApplyEntity,Long>{
}
package com.mortals.xhx.module.matter.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.matter.model.UserMatterDetailsEntity;
import java.util.List;
/**
* 用户申报明细Dao
* 用户申报明细 DAO接口
*
* @author zxfei
* @date 2023-04-10
*/
public interface UserMatterDetailsDao extends ICRUDDao<UserMatterDetailsEntity,Long>{
}
package com.mortals.xhx.module.matter.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.xhx.module.matter.dao.UserMatterApplyDao;
import com.mortals.xhx.module.matter.model.UserMatterApplyEntity;
import java.util.Date;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import java.util.List;
/**
* 用户申报信息DaoImpl DAO接口
*
* @author zxfei
* @date 2023-04-10
*/
@Repository("userMatterApplyDao")
public class UserMatterApplyDaoImpl extends BaseCRUDDaoMybatis<UserMatterApplyEntity,Long> implements UserMatterApplyDao {
}
package com.mortals.xhx.module.matter.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.xhx.module.matter.dao.UserMatterDetailsDao;
import com.mortals.xhx.module.matter.model.UserMatterDetailsEntity;
import java.util.Date;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import java.util.List;
/**
* 用户申报明细DaoImpl DAO接口
*
* @author zxfei
* @date 2023-04-10
*/
@Repository("userMatterDetailsDao")
public class UserMatterDetailsDaoImpl extends BaseCRUDDaoMybatis<UserMatterDetailsEntity,Long> implements UserMatterDetailsDao {
}
......@@ -10,7 +10,7 @@ import com.mortals.xhx.module.matter.model.vo.MatterApplyVo;
* 申报事项实体对象
*
* @author zxfei
* @date 2023-04-07
* @date 2023-04-10
*/
public class MatterApplyEntity extends MatterApplyVo {
......@@ -29,7 +29,7 @@ public class MatterApplyEntity extends MatterApplyVo {
*/
private Long siteMatterId;
/**
* 事项ID
* 基础事项ID
*/
private Long matterId;
/**
......@@ -52,6 +52,10 @@ public class MatterApplyEntity extends MatterApplyVo {
* 部门编码
*/
private String deptCode;
/**
* 事项主题编码
*/
private String themeCode;
/**
* 事项主题名称
*/
......@@ -72,14 +76,6 @@ public class MatterApplyEntity extends MatterApplyVo {
* 政务网地址
*/
private String govUrl;
/**
* 是否生成本地附件
*/
private Integer isConvert;
/**
* 事项主题编码
*/
private String themeCode;
......@@ -127,14 +123,14 @@ public class MatterApplyEntity extends MatterApplyVo {
this.siteMatterId = siteMatterId;
}
/**
* 获取 事项ID
* 获取 基础事项ID
* @return Long
*/
public Long getMatterId(){
return matterId;
}
/**
* 设置 事项ID
* 设置 基础事项ID
* @param matterId
*/
public void setMatterId(Long matterId){
......@@ -210,6 +206,20 @@ public class MatterApplyEntity extends MatterApplyVo {
public void setDeptCode(String deptCode){
this.deptCode = deptCode;
}
/**
* 获取 事项主题编码
* @return String
*/
public String getThemeCode(){
return themeCode;
}
/**
* 设置 事项主题编码
* @param themeCode
*/
public void setThemeCode(String themeCode){
this.themeCode = themeCode;
}
/**
* 获取 事项主题名称
* @return String
......@@ -280,34 +290,6 @@ public class MatterApplyEntity extends MatterApplyVo {
public void setGovUrl(String govUrl){
this.govUrl = govUrl;
}
/**
* 获取 是否生成本地附件
* @return Integer
*/
public Integer getIsConvert(){
return isConvert;
}
/**
* 设置 是否生成本地附件
* @param isConvert
*/
public void setIsConvert(Integer isConvert){
this.isConvert = isConvert;
}
/**
* 获取 事项主题编码
* @return String
*/
public String getThemeCode(){
return themeCode;
}
/**
* 设置 事项主题编码
* @param themeCode
*/
public void setThemeCode(String themeCode){
this.themeCode = themeCode;
}
......@@ -339,13 +321,12 @@ public class MatterApplyEntity extends MatterApplyVo {
sb.append(",deptId:").append(getDeptId());
sb.append(",deptName:").append(getDeptName());
sb.append(",deptCode:").append(getDeptCode());
sb.append(",themeCode:").append(getThemeCode());
sb.append(",themeName:").append(getThemeName());
sb.append(",source:").append(getSource());
sb.append(",reportCount:").append(getReportCount());
sb.append(",datumCount:").append(getDatumCount());
sb.append(",govUrl:").append(getGovUrl());
sb.append(",isConvert:").append(getIsConvert());
sb.append(",themeCode:").append(getThemeCode());
return sb.toString();
}
......@@ -369,6 +350,8 @@ public class MatterApplyEntity extends MatterApplyVo {
this.deptCode = "";
this.themeCode = "";
this.themeName = "";
this.source = null;
......@@ -378,9 +361,5 @@ public class MatterApplyEntity extends MatterApplyVo {
this.datumCount = 0;
this.govUrl = "";
this.isConvert = 0;
this.themeCode = "";
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment