Skip to content

T
topsun-bpm
Commit 4edf8616 authored by wanghang's avatar wanghang
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents a91cf7cd dd71464d
Show whitespace changes
Inline Side-by-side
Showing with 1070 additions and 34 deletions
topsun-xt/src/main/webapp/biz/topsun/customer/customerInfoDetail.jsp 0 → 100644
View file @ 4edf8616
<%@ page contentType="text/html; charset=utf-8" language="java"%>
<%@ taglib uri="/WEB-INF/taglib.tld" prefix="x"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<x:base include="layout,dialog,grid,dateTime,tree,combox,attachment" />
<html>
<head>
<title>Title</title>
</head>
<body>
</body>
</html>
topsun-xt/src/main/webapp/biz/topsun/customer/customerInfoList.js 0 → 100644
View file @ 4edf8616
var gridManager = null;
$(document).ready(function() {
initializationUI();
loadCustomerListGrid();
});
function initializationUI() {
UICtrl.layout("#layout",{leftWidth: 3});
}
function loadCustomerListGrid() {
var toolbarOptions = UICtrl.getDefaultToolbarOptions({
updateHandler: function(){
updateHandler();
}
});
gridManager = UICtrl.grid("#customerInfoListGrid", {
columns: [
{ display: "客户编码", name: "customerCode", width: 100, minWidth: 60, type: "string", align: "left" },
{ display: "客户名称", name: "customerShortName", width: 120, minWidth: 60, type: "string", align: "left" },
// { display: "客户工作时间", name: "customerWorkTime", width: 120, minWidth: 60, type: "datetime", align: "left" },
{ display: "客户英文名称", name: "customerEnName", width: 120, minWidth: 60, type: "string", align: "left" },
{ display: "客户英文名称简称", name: "customer_en_short_name", width: 100, minWidth: 60, type: "string", align: "left" },
{ display: "所属地区", name: "provinceId", width: 150, minWidth: 60, type: "string", align: "left" }
// { display: "客户等级", name: "customerLevel", width: 100, minWidth: 60, type: "string", align: "left" },
// { display: "工厂代号", name: "customerFactoryCode", width: 140, minWidth: 60, type: "string", align: "left" },
// { display: "地址", name: "customer_address", width: 140, minWidth: 60, type: "string", align: "left" },
// { display: "所属集团", name: "customerGroup", width: 140, minWidth: 60, type: "string", align: "left" },
// { display: "邮编", name: "customerZipCode", width: 140, minWidth: 60, type: "string", align: "left" }
],
dataType: "server",
url: web_app.name + '/customer/findCustomerInfo.ajax',
pageSize: 20,
usePager: true,
toolbar: toolbarOptions,
width: "50%",
height: "100%",
heightDiff: -8,
checkbox: true,
fixedCellHeight: true,
selectRowButtonOnly: true,
onDblClickRow : function(data, rowindex, rowobj) {
updateHandler(data);
}
});
UICtrl.setSearchAreaToggle(gridManager);
}
// parms: {
// page: 0,
// size: 30
// },
function updateHandler(data) {
var id = data.customerId;
if (!id) {
id = DataUtil.getUpdateRowId(gridManager);
if (!id) {
return;
}
}
var url=DataUtil.composeURLByParam('/customer/forwardCustomerInfoDetails.do',{ data: JSON.stringify(data) });
UICtrl.addTabItem({tabid:'viewFlowChart' + id, text:"客户详细信息",url:url});
// debugger;
// UICtrl.addTabItem({
// tabid: 'viewFlowChart' + id,
// text: "产品信息",
// url: web_app.name + '/bizFlowChart/showViewFlowchart.load?businessProcessId=' + id
// });
}
topsun-xt/src/main/webapp/biz/topsun/customer/customerInfoList.jsp 0 → 100644
View file @ 4edf8616
<%@ page language="java" contentType="text/html; charset=utf-8"%>
<%@taglib uri="/WEB-INF/taglib.tld" prefix="x"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<html>
<head>
<title>Title</title>
<x:base include="layout,dialog,grid,tree,combox,commonTree" />
<x:script src='/system/opm/js/OpmUtil.js'/>
<x:script src='/biz/topsun/common/purchaseCommon.js'/>
<x:script src='/biz/topsun/customer/customerInfoList.js'/>
</head>
<body>
<div position="center" title="客户信息管理">
<div id="customerInfoListGrid" style="margin: 2px;"></div>
</div>
</body>
</html>
topsun-xt/src/main/webapp/biz/topsun/product/sizeGroup.js
View file @ 4edf8616
......@@ -36,9 +36,12 @@ function loadSizeGroupListGrid() {
type: "string",
align: "left"
},
{display: "创建时间", name: "sizeGroupName", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "修改人", name: "sizeGroupName", width: 100, minWidth: 60, type: "string", align: "left"},
{display: "修改时间", name: "sizeGroupName", width: 120, minWidth: 60, type: "string", align: "left"},
],
dataAction: "server",
url: web_app.name + '/technology/slicedTechnologyList.ajax',
url: web_app.name + '/sizeGroup/findSizeGroupList.ajax',
pageSize: 20,
usePager: true,
toolbar: toolbarOptions,
......@@ -54,3 +57,99 @@ function loadSizeGroupListGrid() {
});
UICtrl.setSearchAreaToggle(gridManager);
}
function query(obj) {
var param = $(obj).formToJSON();
UICtrl.gridSearch(gridManager, param);
}
function reloadGrid() {
gridManager.loadData();
}
function resetForm(obj) {
$(obj).formClean();
}
function addHandler() {
/*UICtrl.showAjaxDialog({
url: web_app.name + '/technology/addTechnologyDetail.load',
title: "新增工艺设置",
width: 1000,
ok: function (div) {
var _self = this;
$('#submitForm', div).ajaxSubmit({
url: web_app.name + '/technology/saveTechnology.ajax',
param: {
processList: getProcessList(),
},
success: function () {
_self.close();
reloadGrid();
}
});
}
});*/
UICtrl.addTabItem({
tabid: 'sizeGroupDetail',
text: "新增尺码组",
url: web_app.name + '/sizeGroup/addSizeGroupDetail.do'
})
}
function updateHandler(row) {
if (!row) {
row = DataUtil.getUpdateRow(gridManager);
if (!row) {
return;
}
}
/*UICtrl.showAjaxDialog({
url: web_app.name + '/technology/showTechnologyDetail.load',
title: "修改工艺设置",
width: 1000,
param: {technologyId: row.technologyId},
ok: function (div) {
var _self = this;
$('#submitForm', div).ajaxSubmit({
url: web_app.name + '/technology/updateTechnology.ajax',
param: {
processList: getProcessList(),
},
success: function () {
_self.close();
reloadGrid();
}
});
}
});*/
UICtrl.addTabItem({
tabid: 'sizeGroupDetail',
text: "修改尺码组",
url: web_app.name + '/sizeGroup/showSizeGroupDetail.do?sizeGroupId='+row.sizeGroupId
})
}
//删除按钮
function deleteHandler() {
DataUtil.del({
action: 'sizeGroup/deleteSizeGroupById.ajax',
gridManager: gridManager, idFieldName: 'sizeGroupId',
onSuccess: function () {
reloadGrid();
}
});
}
function getProcessList() {
var processList = null;
var processManager = UICtrl.getGridManager('#sizeGroupItemListGrid');
if (processManager) {
processList = DataUtil.getGridData({
gridManager: processManager,
isAllData: true
});
processList = Public.encodeJSONURI(processList);
}
return processList;
}
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/product/sizeGroup.jsp
View file @ 4edf8616
......@@ -15,19 +15,19 @@
</head>
<body>
<div class="container-fluid">
<div class="ui-hide">
<x:select name="processType" dictionary="processType" />
<x:select name="yesorno" dictionary="yesorno" />
</div>
<%-- <div class="ui-hide">--%>
<%-- <x:select name="processType" dictionary="processType" />--%>
<%-- <x:select name="yesorno" dictionary="yesorno" />--%>
<%-- </div>--%>
<div id="layout">
<div posinset="center" title="尺码组信息">
<div posinset="center" title="尺码组管理">
<x:title title="common.button.search" hideTable="queryMainForm" isHide="true" />
<form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
<x:inputC name="ruleKind" required="false" label="尺码组名称" labelCol="1"/>
<x:searchButtons />
</form>
<div class="blank_div clearfix"></div>
<div id="technologyListGrid" style="margin: 2px;"></div>
<div id="sizeGroupListGrid" style="margin: 2px;"></div>
</div>
</div>
</div>
......
topsun-xt/src/main/webapp/biz/topsun/product/sizeGroupDetail.js 0 → 100644
View file @ 4edf8616
var sizeGroupGridManager = null;
$(document).ready(function () {
initializateUI();
loadSizeGroupListGrid();
//bindQueryEvent();
bindEvent();
});
function initializateUI() {
UICtrl.layout("#layout", {leftWidth: 3});
}
// 加载页码表格
function loadSizeGroupListGrid() {
var toolbarOptions = UICtrl.getDefaultToolbarOptions({
// 添加一行表格
addHandler: function () {
UICtrl.addGridRow(sizeGroupGridManager);
},
// 删除选中的尺码信息
deleteHandler: function () {
var _grid = UICtrl.getGridManager('#sizeGroupItemListGrid');
DataUtil.delSelectedRows({
action: 'sizeGroup/deleteSizeGroupItemById.ajax',
param: {},
gridManager: _grid,
idFieldName: 'sizeGroupItemId',
onSuccess: function () {
reloadGrid();
}
});
}
});
// 表格
sizeGroupGridManager = UICtrl.grid("#sizeGroupItemListGrid", {
gridManager: null,
columns: [
{
display: "尺码名称",
name: "sizeGroupItemName",
width: 100,
minWidth: 60,
type: "String",
align: "left",
editor: {
type: 'text',
required: true
}
},
{
display: "显示顺序",
name: "sizeGroupItemSequence",
width: 100,
minWidth: 60,
type: "String",
align: "left",
editor: {
type: 'text',
mask: 'nnn',
required: true
}
},
{
display: "备注",
name: "sizeGroupItemRemark",
width: 100,
minWidth: 60,
type: "String",
align: "left",
editor: {
type: 'text',
required: true
}
},
],
dataAction: "server",
url: web_app.name + '/sizeGroup/slicedSizeGroupItemList.ajax',
parms: {sizeGroupId: getId},
pageSize: 20,
usePager: true,
toolbar: toolbarOptions,
enabledEdit: true,
width: "98%",
height: "100%",
heightDiff: -8,
checkbox: true,
fixedCellHeight: true,
selectRowButtonOnly: true,
});
UICtrl.setSearchAreaToggle(sizeGroupGridManager);
}
function bindQueryEvent() {
$('#sizeGroupItemName').searchbox({
type: "sizeGroupItem", name: "sizeGroupItemCode",
onChange: function (value, data) {
$('#sizeGroupItemId').val(data.sizeGroupItemId);
$('#sizeGroupItemName').val(data.sizeGroupItemName);
}
});
}
// 定义点击事件
function bindEvent() {
$("#save").click(function () {
saveData("save");
})
$("#submit").click(function () {
saveData("submit");
})
$("#close").click(function () {//关闭
closeDispatchTabItem();
})
}
function getSizeGroupItemDetail(sizeGroupAction) {
//采购订单保存时数据不进行必填验证，提交时数据才进行必填验证
var op = {};
var check = true;
var sizeGroupItemList = [];
if (sizeGroupAction == "save") {
check = false;
}
op = {check: check};
var sizeGroup = $('#submitForm').formToJSON(op);
if (!sizeGroup) {
return false;
}
sizeGroupItemList = DataUtil.getGridData({
gridManager: sizeGroupGridManager, isAllData: true, onCheck: check})
if (!sizeGroupItemList) {
return false;
}
sizeGroup.sizeGroupItemList = $.toJSON(sizeGroupItemList);
return sizeGroup;
}
// 保存数据
function saveData(action) {
var sizeGroupItemDetail = getSizeGroupItemDetail("submit");
if (!sizeGroupItemDetail) {
return;
}
Public.ajax(web_app.name + '/sizeGroup/saveSizeGroup.ajax?code=' + action,sizeGroupItemDetail,
function (data) {
setId(data.sizeGroupId);
Public.successTip("数据保存成功");
sizeGroupGridManager.setParm('sizeGroupId', data.sizeGroupId);
sizeGroupGridManager.loadData();
}
);
}
// 关闭
function closeDispatchTabItem() {
UICtrl.closeCurrentTab();
}
function setId(value) {
$('#sizeGroupId').val(value);
}
function getId() {
return $("#sizeGroupId").val();
}
/**
* 刷新表格
*/
function reloadGrid(obj) {
sizeGroupGridManager.loadData();
}
topsun-xt/src/main/webapp/biz/topsun/product/sizeGroupDetail.jsp 0 → 100644
View file @ 4edf8616
<%--
Created by IntelliJ IDEA.
User: lenovo
Date: 2023/12/11
Time: 14:36
To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@taglib uri="/WEB-INF/taglib.tld" prefix="x"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<html>
<head>
<x:base include="layout,dialog,grid,tree,combox,commonTree" />
<x:script src='/biz/topsun/product/sizeGroupDetail.js'/></head>
<body>
<x:billTitle title="尺码组详情" needStatus="false" needPerson="true"/>
<div class="blank_div clearfix"></div>
<button class="btn btn-default" type="button" id="close" style="left: 200px;float:right;bottom: 10px;">关闭</button>
<button class="btn btn-warning" type="button" id="submit" style="left: 200px;float:right;bottom: 10px;">提交</button>
<button class="btn btn-success" type="button" id="save" style="left: 200px;float:right;bottom: 10px;">保存</button>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="sizeGroupId" />
<x:hidden name="sizeGroupItemId"/>
<div class="hg-form-row">
<x:inputC name="sizeGroupCode" required="true" label="尺码组编码" labelCol="2" maxLength="64" fieldCol="4" />
<x:inputC name="sizeGroupName" required="true" label="尺码组名称" labelCol="2" maxLength="64" fieldCol="4" />
<x:selectC name="sizeGroupType" label="SIZE类型" labelCol="2" dictionary="sizeGroupType" fieldCol="4" />
</div>
<div class="blank_div clearfix"></div>
<x:title title="尺码设置" name="group" hideTable="#info" />
<div id="sizeGroupItemListGrid" style="margin: 2px;"></div>
</form>
</body>
</html>
topsun/src/main/java/com/huigou/topsun/customer/application/CustomerBaseInfoApplication.java 0 → 100644
View file @ 4edf8616
package com.huigou.topsun.customer.application;
import com.huigou.topsun.customer.domain.Province;
import java.util.List;
public interface CustomerBaseInfoApplication {
Province findByProvinceParentId(String provinceCode);
List<Province> findByProvinceCode(String provinceCode);
}
topsun/src/main/java/com/huigou/topsun/customer/application/CustomerDebtContactApplication.java 0 → 100644
View file @ 4edf8616
package com.huigou.topsun.customer.application;
public interface CustomerDebtContactApplication {
}
topsun/src/main/java/com/huigou/topsun/customer/application/CustomerInfoApplication.java 0 → 100644
View file @ 4edf8616
package com.huigou.topsun.customer.application;
import java.util.List;
import java.util.Map;
/**
* 分页查询客户信息数据
*/
public interface CustomerInfoApplication {
List<Map<String, Object>> findCustomerInfoPage(int page, int size);
}
topsun/src/main/java/com/huigou/topsun/customer/application/CustomerOtherInfoApplication.java 0 → 100644
View file @ 4edf8616
package com.huigou.topsun.customer.application;
public interface CustomerOtherInfoApplication {
}
topsun/src/main/java/com/huigou/topsun/customer/application/Impl/CustomerBaseInfoApplicationImpl.java 0 → 100644
View file @ 4edf8616
package com.huigou.topsun.customer.application.Impl;
import com.huigou.topsun.customer.application.CustomerBaseInfoApplication;
import com.huigou.topsun.customer.domain.Province;
import com.huigou.topsun.customer.repository.ProvinceRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
@Service
public class CustomerBaseInfoApplicationImpl implements CustomerBaseInfoApplication {
@Autowired
private ProvinceRepository provinceRepository;
@Override
public List<Province> findByProvinceCode(String provinceCode) {
Province province = provinceRepository.findByProvinceCode(provinceCode);
List<Province> provinceList = new ArrayList<>();
if (province != null) {
String provinceParentId = province.getProvinceParentId();
//获取上一级信息
Province parentProvince = findByProvinceParentId(provinceParentId);
if (parentProvince != null || !parentProvince.getProvinceParentId().equals(0)) {
//获取上一级信息
Province grandParentProvince = findByProvinceParentId(parentProvince.getProvinceParentId());
provinceList.add(parentProvince);
provinceList.add(grandParentProvince);
}
provinceList.add(parentProvince);
}
provinceList.add(province);
return provinceList;
}
/**
* @param provinceParentId
* @return provinceList
*/
@Override
public Province findByProvinceParentId(String provinceParentId) {
Province province = provinceRepository.findByProvinceParentId(provinceParentId);
return province;
}
}
topsun/src/main/java/com/huigou/topsun/customer/application/Impl/CustomerDebtContactApplicationImpl.java 0 → 100644
View file @ 4edf8616
package com.huigou.topsun.customer.application.Impl;
import com.huigou.topsun.customer.application.CustomerDebtContactApplication;
public class CustomerDebtContactApplicationImpl implements CustomerDebtContactApplication {
}
topsun/src/main/java/com/huigou/topsun/customer/application/Impl/CustomerInfoApplicationImpl.java 0 → 100644
View file @ 4edf8616
package com.huigou.topsun.customer.application.Impl;
import com.huigou.topsun.customer.application.CustomerInfoApplication;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
@Service
public class CustomerInfoApplicationImpl implements CustomerInfoApplication {
/**
* 分页查询客户信息数据
* @param page
* @param size
* @return
*/
@Override
public List<Map<String, Object>> findCustomerInfoPage(int page, int size) {
return null;
}
}
topsun/src/main/java/com/huigou/topsun/customer/application/Impl/CustomerOtherInfoApplicationImpl.java 0 → 100644
View file @ 4edf8616
package com.huigou.topsun.customer.application.Impl;
import com.huigou.topsun.customer.application.CustomerOtherInfoApplication;
public class CustomerOtherInfoApplicationImpl implements CustomerOtherInfoApplication {
}
topsun/src/main/java/com/huigou/topsun/customer/controller/CustomerInfoController.java 0 → 100644
View file @ 4edf8616
package com.huigou.topsun.customer.controller;
import com.huigou.topsun.customer.application.CustomerBaseInfoApplication;
import com.huigou.topsun.customer.application.CustomerInfoApplication;
import com.huigou.topsun.customer.domain.Province;
import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.client.CommonController;
import com.huigou.util.SDO;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Controller
@ControllerMapping("/customerInfo")
public class CustomerInfoController extends CommonController {
@Autowired
private CustomerBaseInfoApplication customerBaseInfoApplication;
@Autowired
private CustomerInfoApplication customerInfoApplication;
@Override
protected String getPagePath() {
return "/biz/topsun/customer/";
}
/**
* 转跳到客户信息列表页面
* @return
*/
public String forwardCustomerInfoList() {
return forward("customerInfoList");
}
/**
* 展示客户信息列表
* @return
*/
public String findCustomerInfo() {
List<Map<String,Object>> customerInfoPage = customerInfoApplication.findCustomerInfoPage(0,30);
HashMap<Object, Object> map = new HashMap<>(3);
map.put("Rows",customerInfoPage);
return toResult(map);
}
/**
* 转跳到客户列表页面
* @return
*/
public String forwardCustomerInfo() {
return forward("customerInfoList");
}
/**
* 转跳到客户详细信息页面
* @return
*/
public String forwardCustomerDetail() {
return forward("customerInfoDetail");
}
/**
* 展示客户省市数据，如果客户的省份编码是省级行政单位，直接返回省份数据，
* 如果客户的省份编码是二级或者三级行政单位，则需要返回对应的省级或者市级行政单位
* @return
*/
public String findProvinceInfo() {
SDO sdo = this.getSDO();
//获取省份编码
String provinceCode = sdo.getString("provinceCode");
List<Province> provinceList = new ArrayList<>();
if (!StringUtils.isEmpty(provinceCode)) {
provinceList = customerBaseInfoApplication.findByProvinceCode(provinceCode);
}
List<String> provinceNameList = provinceList.stream().map(province -> province.getProvinceName()).collect(Collectors.toList());
Map<Object, Object> map = new HashMap<>();
map.put("provinceNameList",provinceNameList);
return toResult(map);
}
/**
* 客户详细信息展示
* @return
*/
// public String loadProductDetail() {
//
// }
}
topsun/src/main/java/com/huigou/topsun/customer/domain/Province.java 0 → 100644
View file @ 4edf8616
package com.huigou.topsun.customer.domain;
import java.io.Serializable;
import javax.persistence.*;
import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
/**
* 省市
*
* @TableName province
*/
@Table(name = "province")
@Data
@Entity
public class Province implements Serializable {
/**
* 主键id
*/
@Id
@GeneratedValue(generator = "system-uuid")
@GenericGenerator(name = "system-uuid", strategy = "guid")
@Column(name = "province_id")
private String provinceId;
/**
* 省
*/
@Column(name = "province_name")
private String provinceName;
/**
* 编码
*/
@Column(name = "province_code")
private String provinceCode;
/**
* 父id
*/
@Column(name = "province_parent_id")
private String provinceParentId;
/**
* 删除标记
*/
@Column(name = "del_flag")
private Integer delFlag;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/customer/repository/ProvinceRepository.java 0 → 100644
View file @ 4edf8616
package com.huigou.topsun.customer.repository;
import com.huigou.topsun.customer.domain.Province;
import org.springframework.data.jpa.repository.JpaRepository;
public interface ProvinceRepository extends JpaRepository<Province,String> {
Province findByProvinceParentId(String provinceParentId);
Province findByProvinceCode(String provinceCode);
}
topsun/src/main/java/com/huigou/topsun/product/application/SizeGroupApplication.java
View file @ 4edf8616
package com.huigou.topsun.product.application;
import com.huigou.topsun.product.domain.SizeGroup;
import com.huigou.topsun.product.domain.query.SizeGroupQueryRequest;
import com.huigou.topsun.product.domain.vo.SizeGroupItemVo;
import com.huigou.topsun.product.domain.vo.SizeGroupVo;
import java.util.List;
import java.util.Map;
/**
......@@ -20,4 +22,18 @@ public interface SizeGroupApplication {
* 获取页码组列表
*/
Map<String,Object> getSizeGroupList(SizeGroupQueryRequest queryRequest);
SizeGroupVo saveSizeGroup(SizeGroupVo sizeGroupVo, List<SizeGroupItemVo> sizeGroupItemList);
void updateSizeGroup(SizeGroupVo sizeGroupVo, List<SizeGroupItemVo> sizeGroupItemList);
SizeGroupVo findSIzeGroupBySizeGroupId(String sizeGroupId);
void deleteSizeGroup(List<String> ids);
// Object slicedSizeGroupItemList(String sizeGroupId);
Object findBySizeGroupId(String sizeGroupId);
void deleteSizeGroupItemById(List<String> ids);
}
topsun/src/main/java/com/huigou/topsun/product/application/impl/SizeGroupApplicationImpl.java
View file @ 4edf8616
......@@ -4,14 +4,21 @@ import com.huigou.cache.DictUtil;
import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.data.query.model.QueryModel;
import com.huigou.topsun.product.application.SizeGroupApplication;
import com.huigou.topsun.product.domain.SizeGroup;
import com.huigou.topsun.product.domain.SizeGroupItem;
import com.huigou.topsun.product.domain.query.SizeGroupQueryRequest;
import com.huigou.topsun.product.domain.vo.SizeGroupItemVo;
import com.huigou.topsun.product.domain.vo.SizeGroupVo;
import com.huigou.topsun.product.repository.SizeGroupItemRepository;
import com.huigou.topsun.product.repository.SizeGroupRepository;
import com.huigou.uasp.bmp.common.application.BaseApplication;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* title:
......@@ -37,4 +44,136 @@ public class SizeGroupApplicationImpl extends BaseApplication implements SizeGro
model.putDictionary("sizeGroupType", DictUtil.getDictionary("sizeGroupType"));
return this.sqlExecutorDao.executeSlicedQuery(model);
}
/**
* 保存尺码组信息及尺码信息
*
* @param sizeGroupVo 尺码组信息
* @param sizeGroupItemList 尺码列表
* @return
*/
@Override
public SizeGroupVo saveSizeGroup(SizeGroupVo sizeGroupVo, List<SizeGroupItemVo> sizeGroupItemList) {
// 获取尺码组对象
SizeGroup sizeGroup = SizeGroupVo.getSizeGroup(sizeGroupVo);
// 封装时间信息
// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
long timestamp = System.currentTimeMillis();
sizeGroup.setCreatedDate(new Date(timestamp));
sizeGroup = save(sizeGroupItemList, sizeGroup);
sizeGroupVo.setSizeGroupId(sizeGroup.getSizeGroupId());
return sizeGroupVo;
}
/**
* 修改尺码组信息
*
* @param sizeGroupVo
* @param sizeGroupItemList
*/
@Override
public void updateSizeGroup(SizeGroupVo sizeGroupVo, List<SizeGroupItemVo> sizeGroupItemList) {
// 获取尺码组对象
SizeGroup sizeGroup = SizeGroupVo.getSizeGroup(sizeGroupVo);
// 封装时间信息
// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
long timestamp = System.currentTimeMillis();
sizeGroup.setLastModifiedDate(new Date(timestamp));
// 获取原有信息
SizeGroup old = sizeGroupRepository.findOne(sizeGroup.getSizeGroupId());
// 封装原有创建人信息到VO对象中
sizeGroup.setCreatedById(old.getCreatedById());
sizeGroup.setCreatedByName(old.getCreatedByName());
sizeGroup.setCreatedDate(old.getCreatedDate());
// 保存修改的信息
save(sizeGroupItemList, sizeGroup);
}
/**
* 根据sizeGroupId获取尺码组信息
* @param sizeGroupId
* @return
*/
@Override
public SizeGroupVo findSIzeGroupBySizeGroupId(String sizeGroupId) {
SizeGroup sizeGroup = sizeGroupRepository.findOne(sizeGroupId);
return SizeGroupVo.getSizeGroupVo(sizeGroup);
}
/**
* 删除尺码组信息及相关尺码
* @param ids
*/
@Override
public void deleteSizeGroup(List<String> ids) {
ids.forEach(sizeGroupId->{
List<SizeGroupItem> sizeGroupItemList = findBySizeGroupId(sizeGroupId);
List<String> sizeGroupItemIds = sizeGroupItemList
.stream()
.map(SizeGroupItem::getSizeGroupItemId)
.collect(Collectors.toList());
//删除尺码组相关的尺码信息
deleteBySizeGroupItemIds(sizeGroupItemIds);
//删除尺码组
sizeGroupRepository.delete(sizeGroupId);
});
}
// @Override
// public Object slicedSizeGroupItemList(String sizeGroupId) {
// QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedTechnologyProcessList");
// String sql = queryDescriptor.getSql();
// return this.sqlExecutorDao.queryToListMap(sql,sizeGroupId);
// return findBySizeGroupId(sizeGroupId);
// }
/**
* 提取方法--保存尺码组信息、尺码列表信息到数据库
*/
private SizeGroup save(List<SizeGroupItemVo> sizeGroupItemList, SizeGroup sizeGroup) {
// 保存
sizeGroup = sizeGroupRepository.saveAndFlush(sizeGroup);
// 保存尺码信息
if (!sizeGroupItemList.isEmpty()) {
// 尺码信息不为空,保存尺码列表
String sizeGroupId = sizeGroup.getSizeGroupId();
for (SizeGroupItemVo sizeGroupItemVo : sizeGroupItemList) {
SizeGroupItem sizeGroupItem = SizeGroupItemVo.getSizeGroupItem(sizeGroupItemVo);
sizeGroupItem.setSizeGroupId(sizeGroupId);
sizeGroupItemRepository.saveAndFlush(sizeGroupItem);
}
}
return sizeGroup;
}
/**
* 删除尺码列表
*/
public void deleteBySizeGroupItemIds(List<String> sizeGroupItemIds) {
List<SizeGroupItem> sizeGroupItemList = sizeGroupItemRepository.findAll(sizeGroupItemIds);
sizeGroupItemRepository.delete(sizeGroupItemList);
}
/**
* 查找尺码组下的尺码列表
*/
@Override
public List<SizeGroupItem> findBySizeGroupId(String sizeGroupId) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "findBySizeGroupId");
String sql = queryDescriptor.getSql();
return this.sqlExecutorDao.queryToList(sql,SizeGroupItem.class,sizeGroupId);
// return sizeGroupItemRepository.findBySizeGroupId(sizeGroupId);
}
@Override
public void deleteSizeGroupItemById(List<String> ids) {
for (String id : ids) {
sizeGroupItemRepository.delete(id);
}
}
}
topsun/src/main/java/com/huigou/topsun/product/controller/SizeGroupController.java
View file @ 4edf8616
package com.huigou.topsun.product.controller;
import com.huigou.cache.DictUtil;
import com.huigou.topsun.product.application.SizeGroupApplication;
import com.huigou.topsun.product.domain.SizeGroup;
import com.huigou.topsun.product.domain.query.SizeGroupQueryRequest;
import com.huigou.topsun.product.domain.vo.SizeGroupItemVo;
import com.huigou.topsun.product.domain.vo.SizeGroupVo;
import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.client.CommonController;
import com.huigou.util.SDO;
import com.huigou.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
......@@ -28,15 +30,29 @@ public class SizeGroupController extends CommonController {
@Override
protected String getPagePath() {
return "/biz/topsun/sizeGroup/";
return "/biz/topsun/product/";
}
/**
* 跳转到尺码组页面
*/
public String forwardSizeGroupList() {
Map<String, String> processType = DictUtil.getDictionary("processType");
this.putAttribute("processType", processType);
return forward("sizeGroup");
}
/**
* 跳转到尺码组添加/修改/明细页面
*/
public String addSizeGroupDetail(){
return forward("sizeGroupDetail");
}
/**
* 获取尺码组列表(分页)
*/
public String findSizeGroupList(){
// TODO
public String findSizeGroupList() {
SDO sdo = this.getSDO();
SizeGroupQueryRequest sizeGroupQueryRequest = sdo.toQueryRequest(SizeGroupQueryRequest.class);
......@@ -46,59 +62,92 @@ public class SizeGroupController extends CommonController {
/**
* 添加新的尺码组信息
*/
public String addSizeGroup(){
//TODO
return "";
public String saveSizeGroup() {
SDO sdo = this.getSDO();
SizeGroupVo sizeGroupVo = sdo.toObject(SizeGroupVo.class);
List<SizeGroupItemVo> sizeGroupItemList = sdo.getList("sizeGroupItemList", SizeGroupItemVo.class);
// 获取操作人信息
String personMemberId = sdo.getOperator().getPersonMemberId();
String personMemberName = sdo.getOperator().getPersonMemberName();
if (StringUtil.isNotBlank(sizeGroupVo.getSizeGroupId())) {
// 封装修改人信息
sizeGroupVo.setLastModifiedById(personMemberId);
sizeGroupVo.setLastModifiedByName(personMemberName);
// 修改尺码组信息和尺码信息
sizeGroupApplication.updateSizeGroup(sizeGroupVo, sizeGroupItemList);
} else {
// 封装创建人信息
sizeGroupVo.setCreatedById(personMemberId);
sizeGroupVo.setCreatedByName(personMemberName);
sizeGroupVo = sizeGroupApplication.saveSizeGroup(sizeGroupVo, sizeGroupItemList);
}
return success(sizeGroupVo);
}
/**
* 编辑选中的尺码组信息
*/
public String updateSizeGroup(){
//TODO
return "";
}
// public String updateSizeGroup() {
// return "";
// }
/**
* 删除选中的尺码组
*/
public String deleteSizeGroupById(){
//TODO
return "";
public String deleteSizeGroupById() {
SDO sdo = this.getSDO();
List<String> ids = sdo.getIds();
sizeGroupApplication.deleteSizeGroup(ids);
return success();
}
/**
* 根据尺码组id获取尺码列表
*/
public String findSizeGroupItemByGroupId(){
//TODO
public String findSizeGroupItemByGroupId() {
return "";
}
/**
* 添加尺码
*/
public String addSizeGroupItem(){
//TODO
public String saveSizeGroupItem() {
return "";
}
/**
* 修改尺码
*/
public String updateSizeGroupItem(){
//TODO
public String updateSizeGroupItem() {
return "";
}
/**
* 删除尺码
*/
public String deleteSizeGroupItemById(){
//TODO
return "";
}
public String deleteSizeGroupItemById() {
SDO sdo = this.getSDO();
List<String> ids = sdo.getIds();
sizeGroupApplication.deleteSizeGroupItemById(ids);
return success();
}
/**
* 查看尺码组明细
*/
public String showSizeGroupDetail() {
SDO sdo = this.getSDO();
String sizeGroupId = sdo.getString("sizeGroupId");
// this.putAttribute("productName", "1");
SizeGroupVo sizeGroupVo = sizeGroupApplication.findSIzeGroupBySizeGroupId(sizeGroupId);
return forward("sizeGroupDetail", sizeGroupVo);
}
public String slicedSizeGroupItemList(){
SDO sdo = this.getSDO();
String sizeGroupId = sdo.getString("sizeGroupId");
return packGridDataAndResult(sizeGroupApplication.findBySizeGroupId(sizeGroupId));
}
}
topsun/src/main/java/com/huigou/topsun/product/domain/SizeGroup.java
View file @ 4edf8616
......@@ -78,5 +78,6 @@ public class SizeGroup implements Serializable {
@Column(name = "last_modified_date")
private Date lastModifiedDate;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/product/domain/vo/SizeGroupItemVo.java 0 → 100644
View file @ 4edf8616
package com.huigou.topsun.product.domain.vo;
import com.alibaba.fastjson.JSON;
import com.huigou.topsun.product.domain.SizeGroupItem;
import com.huigou.topsun.technology.vo.TechnologyProcessVo;
import lombok.Data;
import java.io.Serializable;
/**
* title:
* author:ZHT
* date:2023/12/12
* description:
*/
@Data
public class SizeGroupItemVo implements Serializable{
/**
* 尺码id
*/
private String sizeGroupItemId;
/**
* 尺码组id
*/
private String sizeGroupId;
/**
* 尺码名称
*/
private String sizeGroupItemName;
/**
* 显示顺序
*/
private Integer sizeGroupItemSequence;
/**
* 备注
*/
private String sizeGroupItemRemark;
public static SizeGroupItem getSizeGroupItem(SizeGroupItemVo sizeGroupItemVo){
return JSON.parseObject(JSON.toJSONString(sizeGroupItemVo), SizeGroupItem.class);
}
public static SizeGroupItemVo getProcessVo(SizeGroupItem process){
return JSON.parseObject(JSON.toJSONString(process), SizeGroupItemVo.class);
}
}
topsun/src/main/java/com/huigou/topsun/product/domain/vo/SizeGroupVo.java 0 → 100644
View file @ 4edf8616
package com.huigou.topsun.product.domain.vo;
import com.alibaba.fastjson.JSON;
import com.huigou.topsun.product.domain.SizeGroup;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* title:
* author:ZHT
* date:2023/12/11
* description:
*/
@Data
public class SizeGroupVo implements Serializable {
/**
* 尺码组id
*/
private String sizeGroupId;
/**
* 尺码组名称
*/
private String sizeGroupName;
/**
* 尺码组编码
*/
private String sizeGroupCode;
/**
* 尺码组类型
*/
private String sizeGroupType;
/**
* 录入人
*/
private String createdByName;
/**
* 录入人id
*/
private String createdById;
/**
* 录入时间
*/
private Date createdDate;
/**
* 修改人id
*/
private String lastModifiedById;
/**
* 修改人
*/
private String lastModifiedByName;
/**
* 修改日期
*/
private Date lastModifiedDate;
public static SizeGroupVo getSizeGroupVo(SizeGroup sizeGroup){
return JSON.parseObject(JSON.toJSONString(sizeGroup), SizeGroupVo.class);
}
public static SizeGroup getSizeGroup(SizeGroupVo sizeGroupVo){
return JSON.parseObject(JSON.toJSONString(sizeGroupVo),SizeGroup.class);
}
}
topsun/src/main/java/com/huigou/topsun/product/repository/SizeGroupItemRepository.java
View file @ 4edf8616
......@@ -3,6 +3,8 @@ package com.huigou.topsun.product.repository;
import com.huigou.topsun.product.domain.SizeGroupItem;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
/**
* title:
* author:ZHT
......@@ -10,4 +12,5 @@ import org.springframework.data.jpa.repository.JpaRepository;
* description:
*/
public interface SizeGroupItemRepository extends JpaRepository<SizeGroupItem,String> {
List<SizeGroupItem> findBySizeGroupId(String sizeGroupId);
}
topsun/src/main/resources/config/topsun/product/sizeGroup.xml
View file @ 4edf8616
......@@ -6,4 +6,16 @@
select t.* from size_group t
</sql-query>
</query>
<query name="findBySizeGroupId" label="页码表" table="size_group_item">
<sql-query>
SELECT
t.*
FROM size_group_item t
WHERE
size_group_id = ?
ORDER BY size_group_item_sequence
</sql-query>
</query>
</query-mappings>
\ 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