业务-类型关系代码生成

sp-admin/sa-frame/menu-list.js

@@ -353,7 +353,6 @@ var menuList = [{
 		childList: [{
 				id: 'relation-goods-type-list',
 				name: '业务项管理',
-				icon: 'el-icon-folder-opened',
 				url: 'sa-view/relation-goods-type/relation-goods-type-list.html',
 				childList: [
 					{

sp-admin/sa-view/relation-goods-type/relation-goods-type-list.html

@@ -20,48 +20,22 @@
 				<!-- ------------- 检索参数 ------------- -->
 				<div class="c-title">检索参数</div>
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="text" name="" v-model="p.id"></sa-item>
-					<sa-item type="text" name="" v-model="p.goodsId"></sa-item>
-					<sa-item type="text" name="作业类型" v-model="p.goodsName"></sa-item>
-					<sa-item type="text" name="" v-model="p.typeId"></sa-item>
-					<sa-item type="text" name="类型名称" v-model="p.typeName"></sa-item>
-					<sa-item type="enum" name="载重是否必填" v-model="p.needWeight" 
-						:jv="{1: '是', 0: '否'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="enum" name="规格是否必填" v-model="p.needCarSize" 
-						:jv="{1: '是', 0: '否'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="enum" name="申报单是否必填" v-model="p.needDeclare" 
-						:jv="{1: '是', 0: '否'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="enum" name="申报时间是否必填" v-model="p.needOperateTime" 
-						:jv="{1: '是', 0: '否'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="enum" name="是否必选" v-model="p.needSelect" 
-						:jv="{1: '是', 0: '否'}" jtype="2" def="不限"></sa-item>
+					<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 />
-					<sa-item name="综合排序">
-						<el-radio-group v-model="p.sortType" class="s-radio-text">
-							<el-radio :label="0">默认</el-radio>
-							<el-radio :label="1"></el-radio>
-							<el-radio :label="2"></el-radio>
-							<el-radio :label="3">作业类型</el-radio>
-							<el-radio :label="4"></el-radio>
-							<el-radio :label="5">类型名称</el-radio>
-							<el-radio :label="6">载重是否必填</el-radio>
-							<el-radio :label="7">规格是否必填</el-radio>
-							<el-radio :label="8">申报单是否必填</el-radio>
-							<el-radio :label="9">申报时间是否必填</el-radio>
-							<el-radio :label="10">是否必选</el-radio>
-						</el-radio-group>
-					</sa-item>
 				</el-form>
 				<!-- ------------- 快捷按钮 ------------- -->
-				<sa-item type="fast-btn" show="add,get,delete,export,reset"></sa-item>
+				<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="id" ></sa-td>
-					<sa-td name="" prop="goodsId" ></sa-td>
 					<sa-td name="作业类型" prop="goodsName" ></sa-td>
-					<sa-td name="" prop="typeId" ></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>

sp-server/.gitignore

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

sp-server/src/main/java/com/pj/project/relation_goods_type/RelationGoodsTypeController.java

@@ -2,6 +2,7 @@ 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.*;
@@ -39,15 +40,15 @@ public class RelationGoodsTypeController {
 	@RequestMapping("delete")
 	@SaCheckPermission(RelationGoodsType.PERMISSION_CODE)
 	public AjaxJson delete(Long id){
-		int line = relationGoodsTypeService.delete(id);
-		return AjaxJson.getByLine(line);
+		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); 
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
 		int line = SP.publicMapper.deleteByIds(RelationGoodsType.TABLE_NAME, ids);
 		return AjaxJson.getByLine(line);
 	}
@@ -56,8 +57,8 @@ public class RelationGoodsTypeController {
 	@RequestMapping("update")
 	@SaCheckPermission(RelationGoodsType.PERMISSION_CODE)
 	public AjaxJson update(RelationGoodsType r){
-		int line = relationGoodsTypeService.update(r);
-		return AjaxJson.getByLine(line);
+		relationGoodsTypeService.update(r);
+		return AjaxJson.getSuccess();
 	}
 
 	/** 查 - 根据id */  

sp-server/src/main/java/com/pj/project/relation_goods_type/RelationGoodsTypeMapper.java

@@ -18,34 +18,6 @@ import org.springframework.stereotype.Repository;
 public interface RelationGoodsTypeMapper extends BaseMapper <RelationGoodsType> {
 
 	/**
-	 * 增  
-	 * @param r 实体对象 
-	 * @return 受影响行数 
-	 */
-	int add(RelationGoodsType r);
-
-	/**
-	 * 删  
-	 * @param id 要删除的数据id  
-	 * @return 受影响行数 
-	 */
-	int delete(Long id);	 
-
-	/** 
-	 * 改  
-	 * @param r 实体对象 
-	 * @return 受影响行数 
-	 */
-	int update(RelationGoodsType r);
-
-	/** 
-	 * 查 - 根据id  
-	 * @param id 要查询的数据id 
-	 * @return 实体对象 
-	 */
-	RelationGoodsType getById(Long id);	 
-
-	/**
 	 * 查集合 - 根据条件（参数为空时代表忽略指定条件）
 	 * @param so 参数集合 
 	 * @return 数据列表 

sp-server/src/main/java/com/pj/project/relation_goods_type/RelationGoodsTypeMapper.xml

@@ -2,34 +2,6 @@
 <!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">
 
-	<!-- 增 [G] -->
-	<insert id="add">
-		insert into 
-		relation_goods_type (id, goods_id, goods_name, type_id, type_name, need_weight, need_car_size, need_declare, need_operate_time, need_select) 
-		values (#{id}, #{goodsId}, #{goodsName}, #{typeId}, #{typeName}, #{needWeight}, #{needCarSize}, #{needDeclare}, #{needOperateTime}, #{needSelect}) 
-	</insert>
-
-	<!-- 删 -->
-	<delete id="delete">
-		delete from relation_goods_type 
-		where id = #{id}
-	</delete>
-
-	<!-- 改 [G] -->
-	<update id="update">
-		update relation_goods_type set
-		id = #{id}, 
-		goods_id = #{goodsId}, 
-		goods_name = #{goodsName}, 
-		type_id = #{typeId}, 
-		type_name = #{typeName}, 
-		need_weight = #{needWeight}, 
-		need_car_size = #{needCarSize}, 
-		need_declare = #{needDeclare}, 
-		need_operate_time = #{needOperateTime}, 
-		need_select = #{needSelect}
-		where id = #{id}
-	</update>
 
 
 	<!-- ================================== 查询相关 ================================== -->
@@ -55,14 +27,10 @@
 		from relation_goods_type 
 	</sql>
 	
-	<!-- 查 - 根据id -->
-	<select id="getById" resultMap="model">
-		<include refid="select_sql"></include>
-		where id = #{id}
-	</select>
+
 	
 	<!-- 查集合 - 根据条件（参数为空时代表忽略指定条件） [G] -->
-	<select id="getList" resultMap="model">
+	<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>

sp-server/src/main/java/com/pj/project/relation_goods_type/RelationGoodsTypeService.java

@@ -2,6 +2,11 @@ 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;
 
@@ -12,34 +17,34 @@ import com.pj.utils.sg.*;
  * @author qzy 
  */
 @Service
-public class RelationGoodsTypeService {
+public class RelationGoodsTypeService extends ServiceImpl<RelationGoodsTypeMapper, RelationGoodsType> implements IService<RelationGoodsType> {
 
 	/** 底层 Mapper 对象 */
 	@Autowired
 	RelationGoodsTypeMapper relationGoodsTypeMapper;
 
 	/** 增 */
-	int add(RelationGoodsType r){
-		return relationGoodsTypeMapper.add(r);
+	void add(RelationGoodsType r){
+		this.save(r);
 	}
 
 	/** 删 */
-	int delete(Long id){
-		return relationGoodsTypeMapper.delete(id);
+	void delete(Long id){
+		this.removeById(id);
 	}
 
 	/** 改 */
-	int update(RelationGoodsType r){
-		return relationGoodsTypeMapper.update(r);
+	void update(RelationGoodsType r){
+		this.updateById(r);
 	}
 
 	/** 查 */
 	RelationGoodsType getById(Long id){
-		return relationGoodsTypeMapper.getById(id);
+		return super.getById(id);
 	}
 
 	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
-	List<RelationGoodsType> getList(SoMap so) { 
+	List<RelationGoodsType> getList(SoMap so) {
 		return relationGoodsTypeMapper.getList(so);	
 	}
 	

sp-server/src/main/java/com/pj/project/relation_goods_type/RelationGoodsTypeUtil.java

@@ -1,63 +0,0 @@
-package com.pj.project.relation_goods_type;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.pj.utils.sg.*;
-
-/**
- * 工具类：relation_goods_type -- 业务类型与作业项
- * @author qzy 
- *
- */
-@Component
-public class RelationGoodsTypeUtil {
-
-	
-	/** 底层 Mapper 对象 */
-	public static RelationGoodsTypeMapper relationGoodsTypeMapper;
-	@Autowired
-	private void setRelationGoodsTypeMapper(RelationGoodsTypeMapper relationGoodsTypeMapper) {
-		RelationGoodsTypeUtil.relationGoodsTypeMapper = relationGoodsTypeMapper;
-	}
-	
-	
-	/** 
-	 * 将一个 RelationGoodsType 对象进行进行数据完整性校验 (方便add/update等接口数据校验) [G] 
-	 */
-	static void check(RelationGoodsType r) {
-		AjaxError.throwByIsNull(r.getId(), "[] 不能为空");		// 验证:  
-		AjaxError.throwByIsNull(r.getGoodsId(), "[] 不能为空");		// 验证:  
-		AjaxError.throwByIsNull(r.getGoodsName(), "[作业类型] 不能为空");		// 验证: 作业类型 
-		AjaxError.throwByIsNull(r.getTypeId(), "[] 不能为空");		// 验证:  
-		AjaxError.throwByIsNull(r.getTypeName(), "[类型名称] 不能为空");		// 验证: 类型名称 
-		AjaxError.throwByIsNull(r.getNeedWeight(), "[载重是否必填] 不能为空");		// 验证: 载重是否必填(1=是,0=否) 
-		AjaxError.throwByIsNull(r.getNeedCarSize(), "[规格是否必填] 不能为空");		// 验证: 规格是否必填(1=是,0=否) 
-		AjaxError.throwByIsNull(r.getNeedDeclare(), "[申报单是否必填] 不能为空");		// 验证: 申报单是否必填(1=是,0=否) 
-		AjaxError.throwByIsNull(r.getNeedOperateTime(), "[申报时间是否必填] 不能为空");		// 验证: 申报时间是否必填(1=是,0=否) 
-		AjaxError.throwByIsNull(r.getNeedSelect(), "[是否必选] 不能为空");		// 验证: 是否必选(1=是,0=否) 
-	}
-
-	/** 
-	 * 获取一个RelationGoodsType (方便复制代码用) [G] 
-	 */ 
-	static RelationGoodsType getRelationGoodsType() {
-		RelationGoodsType r = new RelationGoodsType();	// 声明对象 
-		r.setId(0L);		//  
-		r.setGoodsId(0L);		//  
-		r.setGoodsName("");		// 作业类型 
-		r.setTypeId(0L);		//  
-		r.setTypeName("");		// 类型名称 
-		r.setNeedWeight("");		// 载重是否必填(1=是,0=否) 
-		r.setNeedCarSize("");		// 规格是否必填(1=是,0=否) 
-		r.setNeedDeclare("");		// 申报单是否必填(1=是,0=否) 
-		r.setNeedOperateTime("");		// 申报时间是否必填(1=是,0=否) 
-		r.setNeedSelect(0);		// 是否必选(1=是,0=否) 
-		return r;
-	}
-	
-	
-	
-	
-	
-}