From 72f84864736d4fb8edde5ccf057b9d15c241dcb6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 24 十一月 2022 16:06:57 +0800
Subject: [PATCH] #
---
src/main/webapp/views/planType/planType.html | 13 ++++++++++++-
src/main/java/com/zy/crm/common/model/SettleDto.java | 2 ++
src/main/java/com/zy/crm/manager/entity/PlanType.java | 18 ++++++++++++++++++
src/main/resources/mapper/PlanTypeMapper.xml | 1 +
4 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/crm/common/model/SettleDto.java b/src/main/java/com/zy/crm/common/model/SettleDto.java
index 68397d2..5ec1d8c 100644
--- a/src/main/java/com/zy/crm/common/model/SettleDto.java
+++ b/src/main/java/com/zy/crm/common/model/SettleDto.java
@@ -60,6 +60,8 @@
break;
case 5:
dto.setTitle("瀹℃壒閫氳繃");
+ dto.setUserId(plan.getUserId());
+ dto.setUsername(plan.getUserId$());
list.add(dto);
break;
default:
diff --git a/src/main/java/com/zy/crm/manager/entity/PlanType.java b/src/main/java/com/zy/crm/manager/entity/PlanType.java
index 6b33647..1985b47 100644
--- a/src/main/java/com/zy/crm/manager/entity/PlanType.java
+++ b/src/main/java/com/zy/crm/manager/entity/PlanType.java
@@ -73,6 +73,12 @@
private String html;
/**
+ * 鍖哄垎 1: 璐ф灦 0: 缁ф壙
+ */
+ @ApiModelProperty(value= "鍖哄垎 1: 璐ф灦 0: 缁ф壙 ")
+ private Integer type;
+
+ /**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
@@ -153,6 +159,18 @@
return null;
}
+ public String getType$(){
+ if (null == this.type){ return null; }
+ switch (this.type){
+ case 1:
+ return "璐ф灦";
+ case 2:
+ return "闆嗘垚";
+ default:
+ return String.valueOf(this.type);
+ }
+ }
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
diff --git a/src/main/resources/mapper/PlanTypeMapper.xml b/src/main/resources/mapper/PlanTypeMapper.xml
index 158b0b3..82abe06 100644
--- a/src/main/resources/mapper/PlanTypeMapper.xml
+++ b/src/main/resources/mapper/PlanTypeMapper.xml
@@ -11,6 +11,7 @@
<result column="form_id" property="formId" />
<result column="data" property="data" />
<result column="html" property="html" />
+ <result column="type" property="type" />
<result column="status" property="status" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
diff --git a/src/main/webapp/views/planType/planType.html b/src/main/webapp/views/planType/planType.html
index d48f46a..1169eda 100644
--- a/src/main/webapp/views/planType/planType.html
+++ b/src/main/webapp/views/planType/planType.html
@@ -91,6 +91,16 @@
</div>
</div>
<div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鍖哄垎: </label>
+ <div class="layui-input-block">
+ <select name="type" lay-verType="tips" lay-verify="required" required>
+ <option value="">璇烽�夋嫨鍖哄垎</option>
+ <option value="1">璐ф灦</option>
+ <option value="2">闆嗘垚</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
<label class="layui-form-label">绫诲瀷鏍囪瘑</label>
<div class="layui-input-block">
<input class="layui-input" name="flag" placeholder="璇疯緭鍏ユ爣璇�"/>
@@ -165,7 +175,8 @@
{type: 'numbers', title: '#'}
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
,{field: 'name', align: 'center',title: '绫诲瀷鍚嶇О'}
- ,{field: 'flag', align: 'center',title: '绫诲瀷鏍囪瘑'}
+ ,{field: 'type$', align: 'center',title: '鍖哄垎'}
+ // ,{field: 'flag', align: 'center',title: '绫诲瀷鏍囪瘑'}
// ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
// ,{field: 'status$', align: 'center',title: '鐘舵��'}
// ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
--
Gitblit v1.9.1