首页 发现 帮助
注册 登录
qzyReal
/
pco
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

Merge branch 'feature/relation_type_item'

# Conflicts:
#	sp-admin/sa-frame/menu-list.js
qzyReal 3 年之前
父节点
e3e41c11d8 b14184be58
当前提交
40396af3ee
共有 11 个文件被更改，包括 830 次插入 和 20 次删除
分列视图 显示文件统计
  1. 0 6
      sp-admin/sa-frame/menu-list.js
  2. 131 0
      sp-admin/sa-view/relation-goods-type/relation-goods-type-add.html
  3. 69 0
      sp-admin/sa-view/relation-goods-type/relation-goods-type-info.html
  4. 227 0
      sp-admin/sa-view/relation-goods-type/relation-goods-type-list.html
  5. 0 14
      sp-server/.gitignore
  6. 95 0
      sp-server/src/main/java/com/pj/project/relation_goods_type/RelationGoodsType.java
  7. 145 0
      sp-server/src/main/java/com/pj/project/relation_goods_type/RelationGoodsTypeController.java
  8. 28 0
      sp-server/src/main/java/com/pj/project/relation_goods_type/RelationGoodsTypeMapper.java
  9. 72 0
      sp-server/src/main/java/com/pj/project/relation_goods_type/RelationGoodsTypeMapper.xml
  10. 52 0
      sp-server/src/main/java/com/pj/project/relation_goods_type/RelationGoodsTypeService.java
  11. 11 0
      sp-server/src/main/java/com/pj/project/tb_business_car/TbBusinessCarService.java

+ 0 - 6
sp-admin/sa-frame/menu-list.js
查看文件 

@@ -420,12 +420,6 @@ var menuList = [{
 
 					},
 
 				]
 
 			},
 
-			// {
 
-			// 	id: 'tb-business-sort-list',
 
-			// 	name: '项目顺序',
 
-			// 	url: 'sa-view/tb-business-sort/tb-business-sort-list.html',
 
-			// 	childList: []
 
-			// },
 
 		],
 
 
 	},

+ 131 - 0
sp-admin/sa-view/relation-goods-type/relation-goods-type-add.html
查看文件 

@@ -0,0 +1,131 @@
 
+<!DOCTYPE html>
 
+<html>
 
+	<head>
 
+		<title>业务类型与作业项-添加/修改</title>
 
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 
+		<!-- 所有的 css js 资源 -->
 
+		<link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
 
+		<link rel="stylesheet" href="../../static/sa.css">
 
+		<script src="../../static/kj/vue.min.js"></script>
 
+		<script src="../../static/kj/element-ui/index.js"></script>
 
+		<script src="../../static/kj/httpVueLoader.js"></script>
 
+		<script src="../../static/kj/jquery.min.js"></script>
 
+		<script src="../../static/kj/layer/layer.js"></script>
 
+		<script src="../../static/sa.js"></script>
 
+		<style type="text/css">
 
+			.c-panel .el-form .c-label{width: 7em !important;}
 
+			.c-panel .el-form .el-input, .c-panel .el-form .el-textarea__inner{width: 250px;}
 
+		</style>
 
+	</head>
 
+	<body>
 
+		<div class="vue-box" :class="{sbot: id}" style="display: none;" :style="'display: block;'">
 
+			<!-- ------- 内容部分 ------- -->
 
+			<div class="s-body">
 
+				<div class="c-panel">
 
+                    <div class="c-title" v-if="id == 0">数据添加</div>
 
+					<div class="c-title" v-else>数据修改</div>
 
+					<el-form v-if="m">
 
+						<sa-item type="text" name="" v-model="m.id" br></sa-item>
 
+						<sa-item type="text" name="" v-model="m.goodsId" br></sa-item>
 
+						<sa-item type="text" name="作业类型" v-model="m.goodsName" br></sa-item>
 
+						<sa-item type="text" name="" v-model="m.typeId" br></sa-item>
 
+						<sa-item type="text" name="类型名称" v-model="m.typeName" br></sa-item>
 
+						<sa-item type="enum" name="载重是否必填" v-model="m.needWeight" :jv="{1: '是', 0: '否'}" jtype="3" br></sa-item>
 
+						<sa-item type="enum" name="规格是否必填" v-model="m.needCarSize" :jv="{1: '是', 0: '否'}" jtype="3" br></sa-item>
 
+						<sa-item type="enum" name="申报单是否必填" v-model="m.needDeclare" :jv="{1: '是', 0: '否'}" jtype="3" br></sa-item>
 
+						<sa-item type="enum" name="申报时间是否必填" v-model="m.needOperateTime" :jv="{1: '是', 0: '否'}" jtype="3" br></sa-item>
 
+						<sa-item type="enum" name="是否必选" v-model="m.needSelect" :jv="{1: '是', 0: '否'}" jtype="3" br></sa-item>
 
+						<sa-item name="" class="s-ok" br>
 
+							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 
+						</sa-item>
 
+					</el-form>
 
+				</div>
 
+			</div>
 
+			<!-- ------- 底部按钮 ------- -->
 
+			<div class="s-foot">
 
+				<el-button type="primary" @click="ok()">确定</el-button>
 
+				<el-button @click="sa.closeCurrIframe()">取消</el-button>
 
+			</div>
 
+		</div>
 
+        <script>
 
+			
+			var app = new Vue({
 
+				components: {
 
+					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue')
 
+				},
 
+				el: '.vue-box',
 
+				data: {
 
+					id: sa.p('id', 0),		// 获取超链接中的id参数（0=添加，非0=修改） 
+					m: null,		// 实体对象 
+				},
 
+				methods: {
 
+					// 创建一个 默认Model 
+					createModel: function() {
 
+						return {
 
+							id: '',		//  
+							goodsId: '',		//  
+							goodsName: '',		// 作业类型 
+							typeId: '',		//  
+							typeName: '',		// 类型名称 
+							needWeight: '',		// 载重是否必填(1=是,0=否) 
+							needCarSize: '',		// 规格是否必填(1=是,0=否) 
+							needDeclare: '',		// 申报单是否必填(1=是,0=否) 
+							needOperateTime: '',		// 申报时间是否必填(1=是,0=否) 
+							needSelect: '',		// 是否必选(1=是,0=否) 
+						}
 
+					},
 
+					// 提交数据 
+					ok: function(){
 
+						// 表单校验 
+						let m = this.m;
 
+						sa.checkNull(m.id, '请输入 []');
 
+						sa.checkNull(m.goodsId, '请输入 []');
 
+						sa.checkNull(m.goodsName, '请输入 [作业类型]');
 
+						sa.checkNull(m.typeId, '请输入 []');
 
+						sa.checkNull(m.typeName, '请输入 [类型名称]');
 
+						sa.checkNull(m.needWeight, '请输入 [载重是否必填]');
 
+						sa.checkNull(m.needCarSize, '请输入 [规格是否必填]');
 
+						sa.checkNull(m.needDeclare, '请输入 [申报单是否必填]');
 
+						sa.checkNull(m.needOperateTime, '请输入 [申报时间是否必填]');
 
+						sa.checkNull(m.needSelect, '请输入 [是否必选]');
 
+				
+						// 开始增加或修改
 
+						if(this.id <= 0) {	// 添加
 
+							sa.ajax('/RelationGoodsType/add', m, function(res){
 
+								sa.alert('增加成功', this.clean); 
+							}.bind(this));
 
+						} else {	// 修改
 
+							sa.ajax('/RelationGoodsType/update', m, function(res){
 
+								sa.alert('修改成功', this.clean);
 
+							}.bind(this));
 
+						}
 
+					},
 
+					// 添加/修改 完成后的动作
 
+					clean: function() {
 
+						if(this.id == 0) {
 
+							this.m = this.createModel();
 
+						} else {
 
+							parent.app.f5();		// 刷新父页面列表
 
+							sa.closeCurrIframe();	// 关闭本页 
+						}
 
+					}
 
+				},
 
+				mounted: function(){
 
+					// 初始化数据 
+					if(this.id <= 0) {	
+						this.m = this.createModel();
 
+					} else {	
+						sa.ajax('/RelationGoodsType/getById?id=' + this.id, function(res) {
 
+							this.m = res.data;
 
+							if(res.data == null) {
 
+								sa.alert('未能查找到 id=' + this.id + " 详细数据");
 
+							}
 
+						}.bind(this))
 
+					}
 
+				}
 
+			})
 
+			
+		</script>
 
+	</body>
 
+</html>

+ 69 - 0
sp-admin/sa-view/relation-goods-type/relation-goods-type-info.html
查看文件 

@@ -0,0 +1,69 @@
 
+<!DOCTYPE html>
 
+<html>
 
+	<head>
 
+		<title>业务类型与作业项-详情</title>
 
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 
+		<!-- 所有的 css js 资源 -->
 
+		<link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
 
+		<link rel="stylesheet" href="../../static/sa.css">
 
+		<script src="../../static/kj/vue.min.js"></script>
 
+		<script src="../../static/kj/element-ui/index.js"></script>
 
+		<script src="../../static/kj/httpVueLoader.js"></script>
 
+		<script src="../../static/kj/jquery.min.js"></script>
 
+		<script src="../../static/kj/layer/layer.js"></script>
 
+		<script src="../../static/sa.js"></script>
 
+		<style type="text/css">
 
+			.c-panel .c-label{width: 8em;}
 
+		</style>
 
+	</head>
 
+	<body>
 
+		<div class="vue-box sbot" style="display: none;" :style="'display: block;'">
 
+			<!-- ------- 内容部分 ------- -->
 
+			<div class="s-body">
 
+				<div class="c-panel">
 
+					<el-form v-if="m">
 
+						<sa-info name="" br>{{m.id}}</sa-info>
 
+						<sa-info name="" br>{{m.goodsId}}</sa-info>
 
+						<sa-info name="作业类型" br>{{m.goodsName}}</sa-info>
 
+						<sa-info name="" br>{{m.typeId}}</sa-info>
 
+						<sa-info name="类型名称" br>{{m.typeName}}</sa-info>
 
+						<sa-info type="enum" name="载重是否必填" :value="m.needWeight" :jv="{1: '是', 0: '否'}" br></sa-info>
 
+						<sa-info type="enum" name="规格是否必填" :value="m.needCarSize" :jv="{1: '是', 0: '否'}" br></sa-info>
 
+						<sa-info type="enum" name="申报单是否必填" :value="m.needDeclare" :jv="{1: '是', 0: '否'}" br></sa-info>
 
+						<sa-info type="enum" name="申报时间是否必填" :value="m.needOperateTime" :jv="{1: '是', 0: '否'}" br></sa-info>
 
+						<sa-info type="enum" name="是否必选" :value="m.needSelect" :jv="{1: '是', 0: '否'}" br></sa-info>
 
+					</el-form>
 
+				</div>
 
+			</div>
 
+			<!-- ------- 底部按钮 ------- -->
 
+			<div class="s-foot">
 
+				<el-button type="success" @click="sa.closeCurrIframe()">确定</el-button>
 
+				<el-button @click="sa.closeCurrIframe()">取消</el-button>
 
+			</div>
 
+		</div>
 
+		<script>
 
+			var app = new Vue({
 
+				components: {
 
+					"sa-info": httpVueLoader('../../sa-frame/com/sa-info.vue')
 
+				},
 
+				el: '.vue-box',
 
+				data: {
 
+					id: sa.p('id', 0),	// 获取数据ID 
+					m: null
 
+				},
 
+				methods: {
 
+				},
 
+				mounted: function() {
 
+					sa.ajax('/RelationGoodsType/getById?id=' + this.id, function(res) {
 
+						this.m = res.data;
 
+						if(res.data == null) {
 
+							sa.alert('未能查找到 id=' + this.id + " 详细数据");
 
+						}
 
+					}.bind(this))
 
+				}
 
+			})
 
+			
+		</script>
 
+	</body>
 
+</html>

+ 227 - 0
sp-admin/sa-view/relation-goods-type/relation-goods-type-list.html
查看文件 

@@ -0,0 +1,227 @@
 
+<!DOCTYPE html>
 
+<html>
 
+	<head>
 
+		<title>业务类型与作业项-列表</title>
 
+		<meta charset="utf-8">
 
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 
+		<!-- 所有的 css & js 资源 -->
 
+		<link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
 
+		<link rel="stylesheet" href="../../static/sa.css">
 
+		<script src="../../static/kj/vue.min.js"></script>
 
+		<script src="../../static/kj/element-ui/index.js"></script>
 
+		<script src="../../static/kj/httpVueLoader.js"></script>
 
+		<script src="../../static/kj/jquery.min.js"></script>
 
+		<script src="../../static/kj/layer/layer.js"></script>
 
+		<script src="../../static/sa.js"></script>
 
+	</head>
 
+	<body>
 
+		<div class="vue-box" style="display: none;" :style="'display: block;'">
 
+			<div class="c-panel">
 
+				<!-- ------------- 检索参数 ------------- -->
 
+				<div class="c-title">检索参数</div>
 
+				<el-form ref="form" :model='p' @submit.native.prevent>
 
+					<sa-item type="text" name="业务类型" v-model="p.goodsName"></sa-item>
 
+					<sa-item type="text" name="业务名称" v-model="p.typeName"></sa-item>
 
+					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 
+					<br />
 
+				</el-form>
 
+				<!-- ------------- 快捷按钮 ------------- -->
 
+				<div class="fast-btn">
 
+					<el-button v-if="sa.isAuth('relation-goods-type-add')" size="mini" type="primary" @click="add()">
 
+						新增</el-button>
 
+					<el-button size="mini" type="success" @click="getBySelect()">查看</el-button>
 
+					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
 
+				</div>
 
+				<!-- ------------- 数据列表 ------------- -->
 
+				<el-table class="data-table" ref="data-table" :data="dataList" >
 
+					<sa-td type="selection"></sa-td>
 
+					<sa-td name="作业类型" prop="goodsName" ></sa-td>
 
+					<sa-td name="类型名称" prop="typeName" ></sa-td>
 
+					<sa-td name="载重是否必填" prop="needWeight" type="switch" :jv="{1: '是', 0: '否'}" @change="s => updateNeedWeight(s.row)"></sa-td>
 
+					<sa-td name="规格是否必填" prop="needCarSize" type="switch" :jv="{1: '是', 0: '否'}" @change="s => updateNeedCarSize(s.row)"></sa-td>
 
+					<sa-td name="申报单是否必填" prop="needDeclare" type="switch" :jv="{1: '是', 0: '否'}" @change="s => updateNeedDeclare(s.row)"></sa-td>
 
+					<sa-td name="申报时间是否必填" prop="needOperateTime" type="switch" :jv="{1: '是', 0: '否'}" @change="s => updateNeedOperateTime(s.row)"></sa-td>
 
+					<sa-td name="是否必选" prop="needSelect" type="switch" :jv="{1: '是', 0: '否'}" @change="s => updateNeedSelect(s.row)"></sa-td>
 
+					<el-table-column label="操作" fixed="right"  width="240px">
 
+						<template slot-scope="s">
 
+							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
 
+							<el-button class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
 
+							<el-button class="c-btn" type="danger" icon="el-icon-delete" @click="del(s.row)">删除</el-button>
 
+						</template>
 
+					</el-table-column>
 
+				</el-table>
 
+				<!-- ------------- 分页 ------------- -->
 
+				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount" @change="f5()"></sa-item>
 
+			</div>
 
+		</div>
 
+		<script>
 
+			var app = new Vue({
 
+				components: {
 
+					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue'),  
+					"sa-td": httpVueLoader('../../sa-frame/com/sa-td.vue'),		
+				},
 
+				el: '.vue-box',
 
+				data: {
 
+					p: { // 查询参数  
+						id: '',		//  
+						goodsId: '',		//  
+						goodsName: '',		// 作业类型 
+						typeId: '',		//  
+						typeName: '',		// 类型名称 
+						needWeight: '',		// 载重是否必填(1=是,0=否) 
+						needCarSize: '',		// 规格是否必填(1=是,0=否) 
+						needDeclare: '',		// 申报单是否必填(1=是,0=否) 
+						needOperateTime: '',		// 申报时间是否必填(1=是,0=否) 
+						needSelect: '',		// 是否必选(1=是,0=否) 
+						pageNo: 1,		// 当前页 
+						pageSize: 10,	// 页大小 
+						sortType: 0		// 排序方式 
+					},
 
+					dataCount: 0,
 
+					dataList: [], // 数据集合 
+				},
 
+				methods: {
 
+					// 刷新
 
+					f5: function() {
 
+						sa.ajax('/RelationGoodsType/getList', sa.removeNull(this.p), function(res) {
 
+							this.dataList = res.data; // 数据
 
+							this.dataCount = res.dataCount; // 数据总数 
+							sa.f5TableHeight();		// 刷新表格高度 
+						}.bind(this));
 
+					},
 
+					// 查看
 
+					get: function(data) {
 
+						sa.showIframe('数据详情', 'relation-goods-type-info.html?id=' + data.id, '1050px', '90%');
 
+					},
 
+					// 查看 - 根据选中的
 
+					getBySelect: function(data) {
 
+						var selection = this.$refs['data-table'].selection;
 
+						if(selection.length == 0) {
 
+							return sa.msg('请选择一条数据')
 
+						}
 
+						this.get(selection[0]);
 
+					},
 
+					// 修改
 
+					update: function(data) {
 
+						sa.showIframe('修改数据', 'relation-goods-type-add.html?id=' + data.id, '1000px', '90%');
 
+					},
 
+					// 新增
 
+					add: function(data) {
 
+						sa.showIframe('新增数据', 'relation-goods-type-add.html?id=-1', '1000px', '90%');
 
+					},
 
+					// 删除
 
+					del: function(data) {
 
+						sa.confirm('是否删除，此操作不可撤销', function() {
 
+							sa.ajax('/RelationGoodsType/delete?id=' + data.id, function(res) {
 
+								sa.arrayDelete(this.dataList, data);
 
+								sa.ok('删除成功');
 
+								sa.f5TableHeight();		// 刷新表格高度 
+							}.bind(this))
 
+						}.bind(this));
 
+					},
 
+					// 批量删除
 
+					deleteByIds: function() {
 
+						// 获取选中元素的id列表 
+						let selection = this.$refs['data-table'].selection;
 
+						let ids = sa.getArrayField(selection, 'id');
 
+						if(selection.length == 0) {
 
+							return sa.msg('请至少选择一条数据')
 
+						}
 
+						// 提交删除 
+						sa.confirm('是否批量删除选中数据？此操作不可撤销', function() {
 
+							sa.ajax('/RelationGoodsType/deleteByIds', {ids: ids.join(',')}, function(res) {
 
+								sa.arrayDelete(this.dataList, selection);
 
+								sa.ok('删除成功');
 
+								sa.f5TableHeight();		// 刷新表格高度 
+							}.bind(this))
 
+						}.bind(this));
 
+					},
 
+					// 改 - 载重是否必填(1=是,0=否)
 
+					updateNeedWeight: function(data) {
 
+						// 声明变量记录是否成功 
+						var isOk = false;	
+						var oldValue = data.needWeight;
 
+						var ajax = sa.ajax('/RelationGoodsType/updateNeedWeight', {id: data.id, value: data.needWeight}, function(res) {
 
+							isOk = true;
 
+							sa.msg('修改成功');
 
+						}.bind(this));
 
+						// 如果未能修改成功, 则回滚 
+						$.when(ajax).done(function() {
 
+							if(isOk == false) {
 
+								data.status = oldValue; 
+							}
 
+						})
 
+					},
 
+					// 改 - 规格是否必填(1=是,0=否)
 
+					updateNeedCarSize: function(data) {
 
+						// 声明变量记录是否成功 
+						var isOk = false;	
+						var oldValue = data.needCarSize;
 
+						var ajax = sa.ajax('/RelationGoodsType/updateNeedCarSize', {id: data.id, value: data.needCarSize}, function(res) {
 
+							isOk = true;
 
+							sa.msg('修改成功');
 
+						}.bind(this));
 
+						// 如果未能修改成功, 则回滚 
+						$.when(ajax).done(function() {
 
+							if(isOk == false) {
 
+								data.status = oldValue; 
+							}
 
+						})
 
+					},
 
+					// 改 - 申报单是否必填(1=是,0=否)
 
+					updateNeedDeclare: function(data) {
 
+						// 声明变量记录是否成功 
+						var isOk = false;	
+						var oldValue = data.needDeclare;
 
+						var ajax = sa.ajax('/RelationGoodsType/updateNeedDeclare', {id: data.id, value: data.needDeclare}, function(res) {
 
+							isOk = true;
 
+							sa.msg('修改成功');
 
+						}.bind(this));
 
+						// 如果未能修改成功, 则回滚 
+						$.when(ajax).done(function() {
 
+							if(isOk == false) {
 
+								data.status = oldValue; 
+							}
 
+						})
 
+					},
 
+					// 改 - 申报时间是否必填(1=是,0=否)
 
+					updateNeedOperateTime: function(data) {
 
+						// 声明变量记录是否成功 
+						var isOk = false;	
+						var oldValue = data.needOperateTime;
 
+						var ajax = sa.ajax('/RelationGoodsType/updateNeedOperateTime', {id: data.id, value: data.needOperateTime}, function(res) {
 
+							isOk = true;
 
+							sa.msg('修改成功');
 
+						}.bind(this));
 
+						// 如果未能修改成功, 则回滚 
+						$.when(ajax).done(function() {
 
+							if(isOk == false) {
 
+								data.status = oldValue; 
+							}
 
+						})
 
+					},
 
+					// 改 - 是否必选(1=是,0=否)
 
+					updateNeedSelect: function(data) {
 
+						// 声明变量记录是否成功 
+						var isOk = false;	
+						var oldValue = data.needSelect;
 
+						var ajax = sa.ajax('/RelationGoodsType/updateNeedSelect', {id: data.id, value: data.needSelect}, function(res) {
 
+							isOk = true;
 
+							sa.msg('修改成功');
 
+						}.bind(this));
 
+						// 如果未能修改成功, 则回滚 
+						$.when(ajax).done(function() {
 
+							if(isOk == false) {
 
+								data.status = oldValue; 
+							}
 
+						})
 
+					},
 
+				},
 
+				created: function() {
 
+					this.f5();
 
+					sa.onInputEnter();
 
+				}
 
+			})
 
+		</script>
 
+	</body>
 
+</html>

+ 0 - 14
sp-server/.gitignore
查看文件 

@@ -1,14 +0,0 @@
 
-target/
 
-.project
 
-.classpath
 
-.settings
 
-
 
-/.idea/
 
-
 
-node_modules/
 
-bin/
 
-.settings/
 
-unpackage/
 
-/.apt_generated/
 
-/.apt_generated_tests/
 
-/logs/

+ 95 - 0
sp-server/src/main/java/com/pj/project/relation_goods_type/RelationGoodsType.java
查看文件 

@@ -0,0 +1,95 @@
 
+package com.pj.project.relation_goods_type;
 
+
 
+import java.io.Serializable;
 
+import com.baomidou.mybatisplus.annotation.*;
 
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 
+import lombok.EqualsAndHashCode;
 
+
 
+import lombok.Data;
 
+import lombok.experimental.Accessors;
 
+
 
+/**
 
+ * Model: relation_goods_type -- 业务类型与作业项
 
+ * @author qzy 
+ */
 
+@Data
 
+@Accessors(chain = true)
 
+@TableName(RelationGoodsType.TABLE_NAME)
 
+@EqualsAndHashCode(callSuper = false)
 
+public class RelationGoodsType extends Model<RelationGoodsType> implements Serializable {
 
+
 
+	// ---------- 模块常量 ----------
 
+	/**
 
+	 * 序列化版本id 
+	 */
 
+	private static final long serialVersionUID = 1L;	
+	/**
 
+	 * 此模块对应的表名 
+	 */
 
+	public static final String TABLE_NAME = "relation_goods_type";	
+	/**
 
+	 * 此模块对应的权限码 
+	 */
 
+	public static final String PERMISSION_CODE = "relation-goods-type";	
+
 
+
 
+	// ---------- 表中字段 ----------
 
+	/**
 
+	 *  
+	 */
 
+	@TableId(type = IdType.AUTO)
 
+	private Long id;	
+
 
+	/**
 
+	 *  
+	 */
 
+	private Long goodsId;	
+
 
+	/**
 
+	 * 作业类型 
+	 */
 
+	private String goodsName;	
+
 
+	/**
 
+	 *  
+	 */
 
+	private Long typeId;	
+
 
+	/**
 
+	 * 类型名称 
+	 */
 
+	private String typeName;	
+
 
+	/**
 
+	 * 载重是否必填(1=是,0=否) 
+	 */
 
+	private String needWeight;	
+
 
+	/**
 
+	 * 规格是否必填(1=是,0=否) 
+	 */
 
+	private String needCarSize;	
+
 
+	/**
 
+	 * 申报单是否必填(1=是,0=否) 
+	 */
 
+	private String needDeclare;	
+
 
+	/**
 
+	 * 申报时间是否必填(1=是,0=否) 
+	 */
 
+	private String needOperateTime;	
+
 
+	/**
 
+	 * 是否必选(1=是,0=否) 
+	 */
 
+	private Integer needSelect;	
+
 
+
 
+
 
+
 
+
 
+	
+
 
+
 
+}

+ 145 - 0
sp-server/src/main/java/com/pj/project/relation_goods_type/RelationGoodsTypeController.java
查看文件 

@@ -0,0 +1,145 @@
 
+package com.pj.project.relation_goods_type;
 
+
 
+import java.util.List;
 
+
 
+import com.pj.utils.so.SoMap;
 
+import org.springframework.beans.factory.annotation.Autowired;
 
+import org.springframework.transaction.annotation.Transactional;
 
+import org.springframework.web.bind.annotation.*;
 
+
 
+import com.pj.utils.sg.*;
 
+import com.pj.project4sp.SP;
 
+
 
+import com.pj.current.satoken.StpUserUtil;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 
+
 
+
 
+/**
 
+ * Controller: relation_goods_type -- 业务类型与作业项
 
+ * @author qzy 
+ */
 
+@RestController
 
+@RequestMapping("/RelationGoodsType/")
 
+public class RelationGoodsTypeController {
 
+
 
+	/** 底层 Service 对象 */
 
+	@Autowired
 
+	RelationGoodsTypeService relationGoodsTypeService;
 
+
 
+	/** 增 */  
+	@RequestMapping("add")
 
+	@SaCheckPermission(RelationGoodsType.PERMISSION_CODE)
 
+	@Transactional(rollbackFor = Exception.class)
 
+	public AjaxJson add(RelationGoodsType r){
 
+		relationGoodsTypeService.add(r);
 
+		r = relationGoodsTypeService.getById(SP.publicMapper.getPrimarykey());
 
+		return AjaxJson.getSuccessData(r);
 
+	}
 
+
 
+	/** 删 */  
+	@RequestMapping("delete")
 
+	@SaCheckPermission(RelationGoodsType.PERMISSION_CODE)
 
+	public AjaxJson delete(Long id){
 
+		relationGoodsTypeService.delete(id);
 
+		return AjaxJson.getSuccess();
 
+	}
 
+	
+	/** 删 - 根据id列表 */  
+	@RequestMapping("deleteByIds")
 
+	@SaCheckPermission(RelationGoodsType.PERMISSION_CODE)
 
+	public AjaxJson deleteByIds(){
 
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
 
+		int line = SP.publicMapper.deleteByIds(RelationGoodsType.TABLE_NAME, ids);
 
+		return AjaxJson.getByLine(line);
 
+	}
 
+	
+	/** 改 */  
+	@RequestMapping("update")
 
+	@SaCheckPermission(RelationGoodsType.PERMISSION_CODE)
 
+	public AjaxJson update(RelationGoodsType r){
 
+		relationGoodsTypeService.update(r);
 
+		return AjaxJson.getSuccess();
 
+	}
 
+
 
+	/** 查 - 根据id */  
+	@RequestMapping("getById")
 
+	public AjaxJson getById(Long id){
 
+		RelationGoodsType r = relationGoodsTypeService.getById(id);
 
+		return AjaxJson.getSuccessData(r);
 
+	}
 
+
 
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	@RequestMapping("getList")
 
+	public AjaxJson getList() { 
+		SoMap so = SoMap.getRequestSoMap();
 
+		List<RelationGoodsType> list = relationGoodsTypeService.getList(so.startPage());
 
+		return AjaxJson.getPageData(so.getDataCount(), list);
 
+	}
 
+	
+	
+	
+	/** 改 - 载重是否必填(1=是,0=否) */  
+	@RequestMapping("updateNeedWeight")
 
+	@SaCheckPermission(RelationGoodsType.PERMISSION_CODE)
 
+	public AjaxJson updateNeedWeight(Long id, String value){
 
+		int line = SP.publicMapper.updateColumnById(RelationGoodsType.TABLE_NAME, "need_weight", value, id);
 
+		return AjaxJson.getByLine(line);
 
+	}
 
+	
+	/** 改 - 规格是否必填(1=是,0=否) */  
+	@RequestMapping("updateNeedCarSize")
 
+	@SaCheckPermission(RelationGoodsType.PERMISSION_CODE)
 
+	public AjaxJson updateNeedCarSize(Long id, String value){
 
+		int line = SP.publicMapper.updateColumnById(RelationGoodsType.TABLE_NAME, "need_car_size", value, id);
 
+		return AjaxJson.getByLine(line);
 
+	}
 
+	
+	/** 改 - 申报单是否必填(1=是,0=否) */  
+	@RequestMapping("updateNeedDeclare")
 
+	@SaCheckPermission(RelationGoodsType.PERMISSION_CODE)
 
+	public AjaxJson updateNeedDeclare(Long id, String value){
 
+		int line = SP.publicMapper.updateColumnById(RelationGoodsType.TABLE_NAME, "need_declare", value, id);
 
+		return AjaxJson.getByLine(line);
 
+	}
 
+	
+	/** 改 - 申报时间是否必填(1=是,0=否) */  
+	@RequestMapping("updateNeedOperateTime")
 
+	@SaCheckPermission(RelationGoodsType.PERMISSION_CODE)
 
+	public AjaxJson updateNeedOperateTime(Long id, String value){
 
+		int line = SP.publicMapper.updateColumnById(RelationGoodsType.TABLE_NAME, "need_operate_time", value, id);
 
+		return AjaxJson.getByLine(line);
 
+	}
 
+	
+	/** 改 - 是否必选(1=是,0=否) */  
+	@RequestMapping("updateNeedSelect")
 
+	@SaCheckPermission(RelationGoodsType.PERMISSION_CODE)
 
+	public AjaxJson updateNeedSelect(Long id, Integer value){
 
+		int line = SP.publicMapper.updateColumnById(RelationGoodsType.TABLE_NAME, "need_select", value, id);
 
+		return AjaxJson.getByLine(line);
 
+	}
 
+	
+	
+	// ------------------------- 前端接口 -------------------------
 
+	
+	
+	/** 改 - 不传不改 [G] */
 
+	@RequestMapping("updateByNotNull")
 
+	public AjaxJson updateByNotNull(Long id){
 
+		AjaxError.throwBy(true, "如需正常调用此接口，请删除此行代码");
 
+		// 鉴别身份，是否为数据创建者 
+		long userId = SP.publicMapper.getColumnByIdToLong(RelationGoodsType.TABLE_NAME, "user_id", id);
 
+		AjaxError.throwBy(userId != StpUserUtil.getLoginIdAsLong(), "此数据您无权限修改");
 
+		// 开始修改 (请只保留需要修改的字段)
 
+		SoMap so = SoMap.getRequestSoMap();
 
+		so.clearNotIn("id", "goodsId", "goodsName", "typeId", "typeName", "needWeight", "needCarSize", "needDeclare", "needOperateTime", "needSelect").clearNull().humpToLineCase();	
+		int line = SP.publicMapper.updateBySoMapById(RelationGoodsType.TABLE_NAME, so, id);
 
+		return AjaxJson.getByLine(line);
 
+	}
 
+	
+	
+	
+	
+	
+	
+
 
+}

+ 28 - 0
sp-server/src/main/java/com/pj/project/relation_goods_type/RelationGoodsTypeMapper.java
查看文件 

@@ -0,0 +1,28 @@
 
+package com.pj.project.relation_goods_type;
 
+
 
+import java.util.List;
 
+
 
+import org.apache.ibatis.annotations.Mapper;
 
+
 
+import com.pj.utils.so.*;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import org.springframework.stereotype.Repository;
 
+
 
+/**
 
+ * Mapper: relation_goods_type -- 业务类型与作业项
 
+ * @author qzy 
+ */
 
+
 
+@Mapper
 
+@Repository
 
+public interface RelationGoodsTypeMapper extends BaseMapper <RelationGoodsType> {
 
+
 
+	/**
 
+	 * 查集合 - 根据条件（参数为空时代表忽略指定条件）
 
+	 * @param so 参数集合 
+	 * @return 数据列表 
+	 */
 
+	List<RelationGoodsType> getList(SoMap so);
 
+
 
+
 
+}

+ 72 - 0
sp-server/src/main/java/com/pj/project/relation_goods_type/RelationGoodsTypeMapper.xml
查看文件 

@@ -0,0 +1,72 @@
 
+<?xml version="1.0" encoding="UTF-8"?>
 
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
+<mapper namespace="com.pj.project.relation_goods_type.RelationGoodsTypeMapper">
 
+
 
+
 
+
 
+	<!-- ================================== 查询相关 ================================== -->
 
+	<!-- select id, goods_id, goods_name, type_id, type_name, need_weight, need_car_size, need_declare, need_operate_time, need_select from relation_goods_type  -->
 
+	
+	<!-- 通用映射：手动模式 -->
 
+	<resultMap id="model" type="com.pj.project.relation_goods_type.RelationGoodsType">
 
+		<result property="id" column="id" />
 
+		<result property="goodsId" column="goods_id" />
 
+		<result property="goodsName" column="goods_name" />
 
+		<result property="typeId" column="type_id" />
 
+		<result property="typeName" column="type_name" />
 
+		<result property="needWeight" column="need_weight" />
 
+		<result property="needCarSize" column="need_car_size" />
 
+		<result property="needDeclare" column="need_declare" />
 
+		<result property="needOperateTime" column="need_operate_time" />
 
+		<result property="needSelect" column="need_select" />
 
+	</resultMap>
 
+	
+	<!-- 公共查询sql片段 -->
 
+	<sql id="select_sql">
 
+		select * 
+		from relation_goods_type 
+	</sql>
 
+	
+
 
+	
+	<!-- 查集合 - 根据条件（参数为空时代表忽略指定条件） [G] -->
 
+	<select id="getList" resultType="com.pj.project.relation_goods_type.RelationGoodsType">
 
+		<include refid="select_sql"></include>
 
+		<where>
 
+			<if test=' this.has("id") '> and id = #{id} </if>
 
+			<if test=' this.has("goodsId") '> and goods_id = #{goodsId} </if>
 
+			<if test=' this.has("goodsName") '> and goods_name = #{goodsName} </if>
 
+			<if test=' this.has("typeId") '> and type_id = #{typeId} </if>
 
+			<if test=' this.has("typeName") '> and type_name = #{typeName} </if>
 
+			<if test=' this.has("needWeight") '> and need_weight = #{needWeight} </if>
 
+			<if test=' this.has("needCarSize") '> and need_car_size = #{needCarSize} </if>
 
+			<if test=' this.has("needDeclare") '> and need_declare = #{needDeclare} </if>
 
+			<if test=' this.has("needOperateTime") '> and need_operate_time = #{needOperateTime} </if>
 
+			<if test=' this.has("needSelect") '> and need_select = #{needSelect} </if>
 
+		</where>
 
+		order by
 
+		<choose>
 
+			<when test='sortType == 1'> id desc </when>
 
+			<when test='sortType == 2'> goods_id desc </when>
 
+			<when test='sortType == 3'> goods_name desc </when>
 
+			<when test='sortType == 4'> type_id desc </when>
 
+			<when test='sortType == 5'> type_name desc </when>
 
+			<when test='sortType == 6'> need_weight desc </when>
 
+			<when test='sortType == 7'> need_car_size desc </when>
 
+			<when test='sortType == 8'> need_declare desc </when>
 
+			<when test='sortType == 9'> need_operate_time desc </when>
 
+			<when test='sortType == 10'> need_select desc </when>
 
+			<otherwise> id desc </otherwise>
 
+		</choose>
 
+	</select>
 
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
 
+</mapper>

+ 52 - 0
sp-server/src/main/java/com/pj/project/relation_goods_type/RelationGoodsTypeService.java
查看文件 

@@ -0,0 +1,52 @@
 
+package com.pj.project.relation_goods_type;
 
+
 
+import java.util.List;
 
+
 
+import com.baomidou.mybatisplus.extension.service.IService;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import com.pj.project.tb_business.TbBusiness;
 
+import com.pj.project.tb_business.TbBusinessMapper;
 
+import com.pj.utils.so.SoMap;
 
+import org.springframework.beans.factory.annotation.Autowired;
 
+import org.springframework.stereotype.Service;
 
+
 
+import com.pj.utils.sg.*;
 
+
 
+/**
 
+ * Service: relation_goods_type -- 业务类型与作业项
 
+ * @author qzy 
+ */
 
+@Service
 
+public class RelationGoodsTypeService extends ServiceImpl<RelationGoodsTypeMapper, RelationGoodsType> implements IService<RelationGoodsType> {
 
+
 
+	/** 底层 Mapper 对象 */
 
+	@Autowired
 
+	RelationGoodsTypeMapper relationGoodsTypeMapper;
 
+
 
+	/** 增 */
 
+	void add(RelationGoodsType r){
 
+		this.save(r);
 
+	}
 
+
 
+	/** 删 */
 
+	void delete(Long id){
 
+		this.removeById(id);
 
+	}
 
+
 
+	/** 改 */
 
+	void update(RelationGoodsType r){
 
+		this.updateById(r);
 
+	}
 
+
 
+	/** 查 */
 
+	RelationGoodsType getById(Long id){
 
+		return super.getById(id);
 
+	}
 
+
 
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	List<RelationGoodsType> getList(SoMap so) {
 
+		return relationGoodsTypeMapper.getList(so);	
+	}
 
+	
+
 
+}

+ 11 - 0
sp-server/src/main/java/com/pj/project/tb_business_car/TbBusinessCarService.java
查看文件 

@@ -361,6 +361,17 @@ public class TbBusinessCarService extends ServiceImpl<TbBusinessCarMapper, TbBus
 
         if (!tbFeeDetails.isEmpty()) {
 
             return AjaxJson.getError("该车有付款记录，不能删除");
 
         }
 
+        List<TbBusiness> businesses = tbBusinessService.findOtherBusinessByCarId(id);
 
+        if (!businesses.isEmpty()) {
 
+            return AjaxJson.getError("该车有业务，不能删除");
 
+        }
 
+        TbBusinessCar db = this.getById(id);
 
+        if (StrUtil.isNotEmpty(db.getBusinessId())) {
 
+            TbBusiness tbBusiness = tbBusinessService.getById(db.getBusinessId());
 
+            if (tbBusiness != null) {
 
+                return AjaxJson.getError("该车有业务，不能删除");
 
+            }
 
+        }
 
         this.removeById(id);
 
         return AjaxJson.getSuccess();
 
     }