优化

tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysCompanyMapper.java

@@ -10,6 +10,6 @@ public interface SysCompanyMapper extends SuperMapper<SysCompanyEntity>{
 
 	List<SysCompanyEntity> listData(SysCompanyCondition condition);
 	
-	SysCompanyEntity select(String id);
+	SysCompanyEntity selectByCode(String code);
 
 }

tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysCompanyEntity.java

@@ -7,7 +7,6 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.tamguo.config.dao.SuperEntity;
 import com.tamguo.modules.sys.model.enums.SysCompanyStatusEnum;
 
 /**
@@ -15,20 +14,15 @@ import com.tamguo.modules.sys.model.enums.SysCompanyStatusEnum;
  * 
  */
 @TableName(value="sys_company")
-public class SysCompanyEntity extends SuperEntity<SysCompanyEntity> implements Serializable {
+public class SysCompanyEntity implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	private String code;
 	private String name;
 	private String fullName;
 	private String type;
-	private String dutyMan;
-	private String tel;
-	private String address;
-	private String zipCode;
-	private String email;
 	private String remarks;
-	private String parentId;
+	private String parentCode;
 	private Boolean isLeaf;
 	private Integer treeLevel;
 	private Date updateDate;
@@ -57,45 +51,9 @@ public class SysCompanyEntity extends SuperEntity<SysCompanyEntity> implements S
 	public void setType(String type) {
 		this.type = type;
 	}
-	public String getDutyMan() {
-		return dutyMan;
-	}
-	public void setDutyMan(String dutyMan) {
-		this.dutyMan = dutyMan;
-	}
-	public String getTel() {
-		return tel;
-	}
-	public void setTel(String tel) {
-		this.tel = tel;
-	}
-	public String getAddress() {
-		return address;
-	}
-	public void setAddress(String address) {
-		this.address = address;
-	}
-	public String getZipCode() {
-		return zipCode;
-	}
-	public void setZipCode(String zipCode) {
-		this.zipCode = zipCode;
-	}
-	public String getEmail() {
-		return email;
-	}
-	public void setEmail(String email) {
-		this.email = email;
-	}
 	public static long getSerialversionuid() {
 		return serialVersionUID;
 	}
-	public String getParentId() {
-		return parentId;
-	}
-	public void setParentId(String parentId) {
-		this.parentId = parentId;
-	}
 	public String getRemarks() {
 		return remarks;
 	}
@@ -138,5 +96,11 @@ public class SysCompanyEntity extends SuperEntity<SysCompanyEntity> implements S
 	public void setParentName(String parentName) {
 		this.parentName = parentName;
 	}
+	public String getParentCode() {
+		return parentCode;
+	}
+	public void setParentCode(String parentCode) {
+		this.parentCode = parentCode;
+	}
 
 }

tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysCompanyService.java

@@ -15,5 +15,5 @@ public interface ISysCompanyService extends IService<SysCompanyEntity>{
 	List<SysCompanyEntity> listData(SysCompanyCondition condition);
 	
 	/** 根据ID查询公司*/
-	SysCompanyEntity select(String id);
+	SysCompanyEntity selectByCode(String code);
 }

tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysCompanyServiceImpl.java

@@ -22,7 +22,7 @@ public class SysCompanyServiceImpl extends ServiceImpl<SysCompanyMapper, SysComp
 	@Override
 	public List<SysCompanyEntity> treeData(String excludeId) {
 		
-		List<SysCompanyEntity> companyList = sysCompanyMapper.selectList(Condition.create().ne("id", excludeId));
+		List<SysCompanyEntity> companyList = sysCompanyMapper.selectList(Condition.create().ne("code", excludeId));
 		return companyList;
 	}
 
@@ -32,8 +32,8 @@ public class SysCompanyServiceImpl extends ServiceImpl<SysCompanyMapper, SysComp
 	}
 
 	@Override
-	public SysCompanyEntity select(String id) {
-		return sysCompanyMapper.select(id);
+	public SysCompanyEntity selectByCode(String code) {
+		return sysCompanyMapper.selectByCode(code);
 	}
 	
 }

tamguo-oms/src/main/java/com/tamguo/modules/sys/web/CompanyController.java

@@ -36,10 +36,10 @@ public class CompanyController {
 		return model;
 	}
 	
-	@RequestMapping(path="info/{id}")
+	@RequestMapping(path="info/{code}")
 	@ResponseBody
-	public Result info(@PathVariable("id") String id) {
-		return Result.successResult(iSysCompanyService.select(id));
+	public Result info(@PathVariable("code") String code) {
+		return Result.successResult(iSysCompanyService.selectByCode(code));
 	}
 	
 	@RequestMapping(path="listData")

tamguo-oms/src/main/resources/mappers/SysCompanyMapper.xml

@@ -4,19 +4,13 @@
 	
 	<select id="listData" resultType="SysCompanyEntity">
 		SELECT
-			c.id,
 			c.code,
-			c.parent_id,
+			c.parent_code,
 			c.is_leaf,
 			c.tree_level,
 			c.name,
 			c.full_name,
 			c.type,
-			c.duty_man,
-			c.tel,
-			c.address,
-			c.zip_code,
-			c.email,
 			c.remarks,
 			c.update_date,
 			c.status
@@ -26,7 +20,7 @@
 			1 = 1
 			<choose>
 		        <when test="parentCode != null and parentCode != ''">
-		          	and c.parent_id = #{parentCode}
+		          	and c.parent_code = #{parentCode}
 		        </when>
 		        <otherwise>
 		            and c.tree_level = 0
@@ -35,29 +29,23 @@
 		</where>
 	</select>
 	
-	<select id="select" resultType="SysCompanyEntity">
+	<select id="selectByCode" resultType="SysCompanyEntity">
 		SELECT
-			c.id,
 			c.code,
-			c.parent_id,
+			c.parent_code,
 			c.is_leaf,
 			c.tree_level,
 			c.name,
 			c.full_name,
 			c.type,
-			c.duty_man,
-			c.tel,
-			c.address,
-			c.zip_code,
-			c.email,
 			c.update_date,
 			c.create_date,
 			c.`status`,
 			cp.name as parent_name
 		FROM
 			sys_company c
-		LEFT JOIN sys_company cp on cp.id = c.parent_id
+		LEFT JOIN sys_company cp on cp.code = c.parent_code
 		WHERE
-			c.id = #{id}
+			c.code = #{code}
 	</select>
 </mapper>

tamguo-oms/src/main/resources/static/jqGrid/4.7/js/jquery.jqGrid.extend.js

@@ -22,7 +22,7 @@
             },
             treeReader: {
                 level_field: "treeLevel",
-                parent_id_field: "parentId",
+                parent_id_field: "parentCode",
                 userdata: "otherData",
                 leaf_field: "isLeaf",
                 expanded_field: "isOpen",

tamguo-oms/src/main/resources/templates/modules/sys/company/detail.html

@@ -49,7 +49,7 @@
 									<div class="col-sm-8">
 										<div class="input-group treeselect" id="parentDiv"
 											th:attr="data-url=${'sys/company/treeData?excludeId='+ id}">
-											<input id="parentId" type="hidden" name="parentId" v-model="company.parentId" class="isReset" /> 
+											<input id="parentCode" type="hidden" name="parentCode" v-model="company.parentCode" class="isReset" /> 
 											<input id="parentName" type="text" name="parentName" v-model="company.parentName" class="form-control" readonly="readonly" />
 											<span class="input-group-btn">
 												<a id="parentButton" @click="showCompanyDialog" href="javascript:" class="btn btn-default ">
@@ -575,8 +575,8 @@ var vm = new Vue({
 			     }
 			});
 		},
-		getCompany:function(id){
-			axios.get(ctx + "sys/company/info/"+id).then(function(response){
+		getCompany:function(code){
+			axios.get(ctx + "sys/company/info/"+code).then(function(response){
 			    vm.company = response.data.result;
 			})
 		},
@@ -629,10 +629,10 @@ var vm = new Vue({
 							return false;
 						}
 					}
-					vm.company.parentId = codes.join(',');
+					vm.company.parentCode = codes.join(',');
 					vm.company.parentName = names.join(',');
 					try {
-						$('#parentId,#parentName').valid();
+						$('#parentCode,#parentName').valid();
 					} catch (e) {
 					}
 					if (typeof treeselectCallback == 'function') {
@@ -642,7 +642,7 @@ var vm = new Vue({
 			};
 			options.btn.push('<i class="fa fa-eraser"></i> 清除');
 			options['btn'+ options.btn.length] = function(index,layero) {
-				$("#parentId").val('').change();
+				$("#parentCode").val('').change();
 				$("#parentName").val('').change();
 				if (typeof treeselectCallback == 'function') {
 					treeselectCallback('parent','clear',index,layero);
@@ -660,7 +660,7 @@ var vm = new Vue({
 	watch:{
 	}
 });
-var id = [[${id}]];
+var id = '[[${id}]]';
 if(!/^(undefined|null|\s*)?$/.test(id)){
 	vm.getCompany(id);
 }

tamguo-oms/src/main/resources/templates/modules/sys/company/index.html

@@ -87,8 +87,9 @@ $('#dataGrid').dataGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
 		{header:'公司名称', name:'name', index:'a.company_name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){
-			return '( '+row.code+' ) '+'<a href="/js/a/sys/company/form?companyCode='+row.uid+'" class="btnList" data-title="编辑公司">'+(val||row.code)+'</a>';
+			return '( '+row.code+' ) '+'<a href="/js/a/sys/company/form?companyCode='+row.code+'" class="btnList" data-title="编辑公司">'+(val||row.code)+'</a>';
 		}},
+		{header:'公司编码', name:'code', index:'a.code',hidden : true, align:"left"},
 		{header:'公司全称', name:'fullName', index:'a.full_name', width:200, align:"left"},
 		{header:'排序号', name:'treeSort', index:'a.tree_sort', width:80, align:"center"},
 		{header:'归属区域', name:'area.treeNames', index:'a.areaCode', width:200, align:"center"},
@@ -99,7 +100,7 @@ $('#dataGrid').dataGrid({
 		}},
 		{header:'操作', name:'actions', width:130, sortable:false, title:false, formatter: function(val, obj, row, act){
 			var actions = [];
-				actions.push('<a href="'+ctx+'sys/company/detail?id='+row.id+'" class="btnList" title="编辑公司"><i class="fa fa-pencil"></i></a>&nbsp;');
+				actions.push('<a href="'+ctx+'sys/company/detail?id='+row.code+'" class="btnList" title="编辑公司"><i class="fa fa-pencil"></i></a>&nbsp;');
 				if (row.status == Global.STATUS_NORMAL){
 					actions.push('<a href="/js/a/sys/office/disable?officeCode='+row.officeCode+'" class="btnList" title="停用机构" data-confirm="确认要停用该机构吗？"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
 				}