Skip to content

T
topsun-bpm
Commit 8aeb857b authored by wanghang's avatar wanghang
Browse files
Options

主页 任务展示

parent 03333e0f
Hide whitespace changes
Inline Side-by-side
Showing with 1200 additions and 81 deletions
.idea/dataSources.xml
View file @ 8aeb857b
...@@ -8,5 +8,12 @@ ...@@ -8,5 +8,12 @@
<jdbc-url>jdbc:mysql://192.168.222.122:3406/topsun</jdbc-url> <jdbc-url>jdbc:mysql://192.168.222.122:3406/topsun</jdbc-url>
<working-dir>$ProjectFileDir$</working-dir> <working-dir>$ProjectFileDir$</working-dir>
</data-source> </data-source>
<data-source source="LOCAL" name="topsun@192.168.3.91" uuid="f1671338-53c3-4164-87ff-b7dbcec2fd91">
<driver-ref>mysql.8</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>com.mysql.jdbc.Driver</jdbc-driver>
<jdbc-url>jdbc:mysql://192.168.3.91:3406/topsun</jdbc-url>
<working-dir>$ProjectFileDir$</working-dir>
</data-source>
</component> </component>
</project> </project>
\ No newline at end of file
.idea/mybatisx/templates.xml
View file @ 8aeb857b
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
<option name="tableUIInfoList"> <option name="tableUIInfoList">
<list> <list>
<TableUIInfo> <TableUIInfo>
<option name="className" value="SapNonProdApplyDept" /> <option name="className" value="BsnMessage" />
<option name="tableName" value="sap_non_prod_apply_dept" /> <option name="tableName" value="bsn_message" />
</TableUIInfo> </TableUIInfo>
</list> </list>
</option> </option>
......
huigou-xt/src/main/webapp/system/taskCenter/TasksExecute.js
View file @ 8aeb857b
...@@ -76,7 +76,9 @@ function showTask(taskKind){ ...@@ -76,7 +76,9 @@ function showTask(taskKind){
} }
function reloadExecuteTasks() { function reloadExecuteTasks() {
debugger
Public.ajax(web_app.name + "/homePage/queryAllTasks.ajax", {}, function (data) { Public.ajax(web_app.name + "/homePage/queryAllTasks.ajax", {}, function (data) {
debugger
parseTaskHtml('#waitTaskContent',data['tasks']); parseTaskHtml('#waitTaskContent',data['tasks']);
parseTaskHtml('#trackTaskContent',data['trackingTasks']); parseTaskHtml('#trackTaskContent',data['trackingTasks']);
$('span.taskCount').html(data['taskCount']); $('span.taskCount').html(data['taskCount']);
......
huigou-xt/src/main/webapp/system/taskCenter/TasksTracking.jsp
View file @ 8aeb857b
<%@ page language="java" contentType="text/html; charset=utf-8"%> <%@ page language="java" contentType="text/html; charset=utf-8"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<div class="data-list-warp" id="trackTaskContent"> <div class="data-list-warp" id="trackTaskContent">
<c:forEach items="${trackingTasks}" var="task">
<div id="task_<c:out value="${task.id}"/>" <c:forEach items="${trackingTasks}" var="task">
taskId="<c:out value="${task.id}"/>" <div id="task_<c:out value="${task.id}"/>"
bizId="<c:out value="${task.bizId}"/>" taskId="<c:out value="${task.id}"/>"
name="<c:out value="${task.name}"/>" bizId="<c:out value="${task.businessId}"/>"
url="<c:out value="${task.executorUrl}"/>"> name="<c:out value="${task.title}"/>"
<div class="title-view"> url="<c:out value="${task.executorUrl}"/>">
<a href="javascript:void(0);" class="aLink" taskId="<c:out value="${task.id}"/>" title="<c:out value="${task.description}" />"> <div class="title-view">
<c:out value="${task.description}" /> <a href="javascript:void(0);" class="aLink" taskId="<c:out value="${task.id}"/>" title="<c:out value="${task.title}" />">
</a> <c:out value="${task.title}" />
</div> </a>
<div class="date-view"> </div>
<a href="javascript:void(0);" class="aLink" taskId="<c:out value="${task.id}"/>"> <div class="date-view">
<c:out value="${task.startTime}" /> <a href="javascript:void(0);" class="aLink" taskId="<c:out value="${task.id}"/>">
</a> <c:out value="${task.createDate}" />
</div> </a>
</div> </div>
</c:forEach> </div>
</c:forEach>
<%-- <c:forEach items="${trackingTasks}" var="task">--%>
<%-- <div id="task_<c:out value="${task.id}"/>"--%>
<%-- taskId="<c:out value="${task.id}"/>"--%>
<%-- bizId="<c:out value="${task.bizId}"/>"--%>
<%-- name="<c:out value="${task.name}"/>"--%>
<%-- url="<c:out value="${task.executorUrl}"/>">--%>
<%-- <div class="title-view">--%>
<%-- <a href="javascript:void(0);" class="aLink" taskId="<c:out value="${task.id}"/>" title="<c:out value="${task.description}" />">--%>
<%-- <c:out value="${task.description}" />--%>
<%-- </a>--%>
<%-- </div>--%>
<%-- <div class="date-view">--%>
<%-- <a href="javascript:void(0);" class="aLink" taskId="<c:out value="${task.id}"/>">--%>
<%-- <c:out value="${task.startTime}" />--%>
<%-- </a>--%>
<%-- </div>--%>
<%-- </div>--%>
<%-- </c:forEach>--%>
</div> </div>
\ No newline at end of file
topsun-xt/src/main/webapp/HomePage.jsp
View file @ 8aeb857b
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<div class="col-sm-6 col-xs-12"> <div class="col-sm-6 col-xs-12">
<div class="box box-success"> <div class="box box-success">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">跟踪任务</h3> <h3 class="box-title">专项任务</h3>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" title="刷新" onclick="reloadGrid()"><i class="fa fa-repeat"></i></button> <button type="button" class="btn btn-box-tool" title="刷新" onclick="reloadGrid()"><i class="fa fa-repeat"></i></button>
<button type="button" class="btn btn-box-tool" title="更多" onclick="trackTaskMore()"><i class="fa fa-bars"></i></button> <button type="button" class="btn btn-box-tool" title="更多" onclick="trackTaskMore()"><i class="fa fa-bars"></i></button>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.js
View file @ 8aeb857b
...@@ -24,9 +24,9 @@ function loadNonProdApplyListGrid() { ...@@ -24,9 +24,9 @@ function loadNonProdApplyListGrid() {
} }
UICtrl.addTabItem({ UICtrl.addTabItem({
tabid: 'showNonProdApplyNext', tabid: 'showNonProdApplyNext'+result.id,
text: "非产品/非本成品类物料主数据维护申请详情", text: "非产品/非本成品类物料主数据维护申请详情",
url: web_app.name + '/sapNonProdApply/forwardNonProdApplyNext.do?bizId='+result.id url: web_app.name + '/sapNonProdApplyNext/forwardNonProdApplyNext.do?bizId='+result.id
}); });
} }
} }
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js
View file @ 8aeb857b
let gridManager=null;
$(document).ready(function () { $(document).ready(function () {
initializate() initializate()
loadGrid(); loadGrid();
console.log($("#businessUsage").val())
}) })
function initializate() { function initializate() {
...@@ -45,39 +47,85 @@ function initializate() { ...@@ -45,39 +47,85 @@ function initializate() {
function loadGrid() { function loadGrid() {
resourceGridManager = UICtrl.grid("#businessPersonnelListGrid", { let coRowNum = $("#businessUsage").val().replace(/,/g, '')+1;
// let length = dept.length;
// let dept=$("#businessUsage").val().split(",");
// let a=(dept.length+1)*37.5;
gridManager = UICtrl.grid("#businessPersonnelListGrid", {
columns: [ columns: [
{ display: "部门", name: "version", width: 200, minWidth: 60, type: "string", align: "left" }, { display: "部门", name: "deptName", width: 200, minWidth: 60, type: "string", align: "left" },
{ display: "部门人员", name: "resourceName", width: 200, minWidth: 60, type: "string", align: "left", { display: "部门人员", name: "userName", width: 200, minWidth: 60, type: "string", align: "left",
editor: { editor: {
required: true, type: "select", required: true, type: "select",
data: { data: {
type: 'system', type: 'system',
name: "resourceNameGroup", name: "testUser",
back: { back: {
id: "resourceId", id: "userName",
gxmc:"resourceName", userCode:"userCode"
version:"version",
}, },
getParam: function () { getParam: function (data) {
return {paramValue: $("#processType").val()} return {deptCode: data.deptCode}
}, },
}, },
} }
},
{ display: "人员Id", name: "userCode", width: 200, minWidth: 60, type: "string", align: "left",
editor: {
type: 'text',
required: true
}
} }
], ],
dataAction: "server", dataAction: "server",
url: web_app.name + '/process/slicedProcessResourceList.ajax', url: web_app.name + '/sapNonProdApplyNext/slicedDeptList.ajax',
parms:{processId:$("#processId").val()}, parms:{dept:$("#businessUsage").val()},
pageSize: 20, pageSize: 20,
usePager: false, usePager: false,
enabledEdit: true, enabledEdit: true,
width: "100%", width: "100%",
height: "300", height:coRowNum*37.5,
heightDiff: -8, heightDiff: -8,
fixedCellHeight: true, fixedCellHeight: true,
selectRowButtonOnly: true selectRowButtonOnly: true
}); });
UICtrl.setSearchAreaToggle(resourceGridManager); UICtrl.setSearchAreaToggle(gridManager);
}
/**
* 表单提交
* @returns {boolean}
*/
function saveForm() {
let msg="[";
let isUndefined=false
const result = DataUtil.getGridData({
gridManager: gridManager,
isAllData: true,
onCheck: function(data) {
if (typeof data.userCode === 'undefined') {
msg += `${data.deptName}、`;
isUndefined = true;
}
console.log(data);
}
});
if (isUndefined) {
Public.tip(`${msg.slice(0, -1)}]未选择对应分发人员`);
}
// var _self = this;
// $('#submitForm').ajaxSubmit({
// url: web_app.name + '/proofingMake/saveProofingMake.ajax',
// param: extendedData,
// success: function (data) {
// Public.successTip("保存成功！");
// _self.close();
// }
// });
}
function distributeForm(){
} }
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.jsp
View file @ 8aeb857b
...@@ -16,15 +16,14 @@ ...@@ -16,15 +16,14 @@
<x:billTitle title="非产品/非本成品类物料主数据维护申请表" needStatus="false" needPerson="true"/> <x:billTitle title="非产品/非本成品类物料主数据维护申请表" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm"> <form class="hg-form" method="post" action="" id="submitForm">
<div style="float: right; margin-right: 10px" class="btn-group" >
<div style="text-align: right;padding-right: 50px;" class="btn-group" > <button id="save" title="" type="button" onclick="saveForm()" class="btn btn-gray"><i
<button id="save" title="" type="button" class="btn btn-gray"><i
class="fa fa-save"></i>保存 class="fa fa-save"></i>保存
</button> </button>
<button id="back" title="" type="button" class="btn btn-gray"><i <button id="back" title="" type="button" class="btn btn-gray"><i
class="fa fa-reply"></i>回退 class="fa fa-reply"></i>撤销
</button> </button>
<button id="showChart" title="" type="button" class="btn btn-gray" ><i <button id="showChart" title="" type="button" onclick="distributeForm()" class="btn btn-gray" ><i
class="fa fa-sitemap"></i>分发 class="fa fa-sitemap"></i>分发
</button> </button>
</div> </div>
...@@ -83,6 +82,7 @@ ...@@ -83,6 +82,7 @@
<div class="hg-form-cols"> <div class="hg-form-cols">
<div class="hg-form-row"> <div class="hg-form-row">
<x:hidden name="businessUsage"/>
<x:checkboxListC name="businessUsage" label="业务用途" dictionary="serviceusage" labelCol="1" <x:checkboxListC name="businessUsage" label="业务用途" dictionary="serviceusage" labelCol="1"
fieldCol="11"/> fieldCol="11"/>
</div> </div>
......
topsun/pom.xml
View file @ 8aeb857b
...@@ -161,6 +161,12 @@ ...@@ -161,6 +161,12 @@
<version>3.5.13</version> <version>3.5.13</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.6.1</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
topsun/src/main/java/com/huigou/topsun/base/bsnMessage/appliction/BsnMessageApplication.java 0 → 100644
View file @ 8aeb857b
package com.huigou.topsun.base.bsnMessage.appliction;
import com.huigou.topsun.base.bsnMessage.domain.query.BsnMessageQueryRequest;
import java.util.Map;
public interface BsnMessageApplication {
String QUERY_XML_FILE_PATH = "config/topsun/base/bsnMessage.xml";
Map<String,Object> queryBsnMessage();
}
topsun/src/main/java/com/huigou/topsun/base/bsnMessage/appliction/impl/BsnMessageApplicationImpl.java 0 → 100644
View file @ 8aeb857b
package com.huigou.topsun.base.bsnMessage.appliction.impl;
import com.huigou.data.domain.model.CommonDomainConstants;
import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.data.query.model.QueryModel;
import com.huigou.exception.ApplicationException;
import com.huigou.topsun.base.bsnMessage.appliction.BsnMessageApplication;
import com.huigou.topsun.base.bsnMessage.domain.query.BsnMessageQueryRequest;
import com.huigou.topsun.base.coderule.application.CodeRuleApplication;
import com.huigou.topsun.base.coderule.domain.model.CodeRule;
import com.huigou.topsun.base.coderule.domain.model.CodeRuleKind;
import com.huigou.topsun.base.coderule.domain.query.CodeRuleQueryRequest;
import com.huigou.topsun.base.coderule.repository.CodeRuleRepository;
import com.huigou.uasp.bmp.common.application.BaseApplication;
import com.huigou.uasp.bmp.opm.domain.model.org.Org;
import com.huigou.uasp.bmp.opm.proxy.OrgApplicationProxy;
import com.huigou.util.ApplicationContextWrapper;
import com.huigou.util.DateUtil;
import com.huigou.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* 采购编号及合同编号编码规则
*
* @ClassName: CodeRuleApplicationImpl
* @author
* @date 2018-06-20 15:20
* @version V1.0
*/
@Service("bsnMessageApplication")
public class BsnMessageApplicationImpl extends BaseApplication implements BsnMessageApplication {
@Override
public Map<String, Object> queryBsnMessage() {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "queryBsnMessage");
QueryModel queryModel = new QueryModel();
queryModel.setSql(queryDescriptor.getSql());
queryModel.setPageIndex(1);
queryModel.setPageSize(10);
queryModel.setSortFieldName("createDate");
queryModel.setSortOrder("desc");
queryModel.putParam("listners", this.getOperator().getUserId());
return this.sqlExecutorDao.executeSlicedQuery(queryModel);
}
}
topsun/src/main/java/com/huigou/topsun/base/bsnMessage/domain/BsnMessage.java 0 → 100644
View file @ 8aeb857b
package com.huigou.topsun.base.bsnMessage.domain;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
/**
*
* @TableName bsn_message
*/
@Table(name="bsn_message")
@Entity
@Data
public class BsnMessage implements Serializable {
/**
* id
*/
@Id
private String id;
/**
* 任务描述
*/
private String title;
/**
* 任务执行人
*/
private String listners;
/**
* 业务应用类型
*/
@Column(name = "business_code")
private String businessCode;
/**
* 业务表单id
*/
@Column(name = "business_id")
private String businessId;
/**
* 创建日期
*/
@Column(name = "create_date")
private Date createDate;
/**
* 完成日期
*/
@Column(name = "finished_date")
private Date finishedDate;
/**
*任务执行地址
*/
@Column(name = "executor_url")
private Date executorUrl;
/**
* 完成状态（默认为未完成：0，完成为：1，保存未分发：2）
*/
private Integer active;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/base/bsnMessage/domain/query/BsnMessageQueryRequest.java 0 → 100644
View file @ 8aeb857b
package com.huigou.topsun.base.bsnMessage.domain.query;
import com.huigou.data.domain.query.QueryAbstractRequest;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
/**
*
* @TableName bsn_message
*/
@Data
public class BsnMessageQueryRequest extends QueryAbstractRequest {
/**
* id
*/
private String id;
/**
* 任务描述
*/
private String title;
/**
* 任务执行人
*/
private String listners;
/**
* 业务应用类型
*/
private String businessCode;
/**
* 业务表单id
*/
private String businessId;
/**
* 创建日期
*/
private Date createDate;
/**
* 完成日期
*/
private Date finishedDate;
private String executorUrl;
/**
* 完成状态（默认为未完成：0，完成为：1，保存未分发：2）
*/
private Integer active;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/base/bsnMessage/repository/BsnMessageRepository.java 0 → 100644
View file @ 8aeb857b
package com.huigou.topsun.base.bsnMessage.repository;
import com.huigou.topsun.base.bsnMessage.domain.BsnMessage;
import org.springframework.data.jpa.repository.JpaRepository;
public interface BsnMessageRepository extends JpaRepository<BsnMessage,String> {
}
topsun/src/main/java/com/huigou/topsun/product/domain/http-client.private.env.json 0 → 100644
View file @ 8aeb857b
{
"dev": {
"name": "value"
}
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/NonProdApplyDeptApplication.java 0 → 100644
View file @ 8aeb857b
package com.huigou.topsun.sap.nonProdApply.application;
import com.huigou.topsun.sap.nonProdApply.domain.NonProdApplyBaseInfo;
import com.huigou.topsun.sap.nonProdApply.domain.SapNonProdApplyDept;
import com.huigou.topsun.sap.nonProdApply.domain.query.NonProdApplyBaseInfoQueryRequest;
import com.huigou.util.SDO;
import java.util.List;
import java.util.Map;
public interface NonProdApplyDeptApplication {
String QUERY_XML_FILE_PATH="config/topsun/sap/nonProdApply/nonProdApplyDept.xml";
/**
* 编辑详细信息
* @param sdo
*/
void saveSapNonProdApplyDept(SDO sdo);
/**
* 更改分发状态
* @param sdo
*/
void distributeSapNonProdApplyDept(SDO sdo);
SapNonProdApplyDept getNonProdApplyDeptById(String id);
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java 0 → 100644
View file @ 8aeb857b
package com.huigou.topsun.sap.nonProdApply.application.impl;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.huigou.topsun.proofing.domain.proofingApply.model.ProofingApplyProcess;
import com.huigou.topsun.sap.nonProdApply.application.NonProdApplyDeptApplication;
import com.huigou.topsun.sap.nonProdApply.domain.SapNonProdApplyDept;
import com.huigou.topsun.sap.nonProdApply.repository.NonProdApplyDeptRepository;
import com.huigou.uasp.bmp.common.application.BaseApplication;
import com.huigou.util.SDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class NonProdApplyDeptApplicationImpl extends BaseApplication implements NonProdApplyDeptApplication {
@Autowired
NonProdApplyDeptRepository nonProdApplyDeptRepository;
@Override
public void saveSapNonProdApplyDept(SDO sdo) {
SapNonProdApplyDept nonProdApplyDept = sdo.toObject(SapNonProdApplyDept.class);
ObjectMapper objectMapper = new ObjectMapper();
String deptStaffJSON = sdo.getString("deptStaff");
List<BsnMessage> processList = objectMapper.readValue(processJSON, new TypeReference<List<ProofingApplyProcess>>() {
});
SapNonProdApplyDept save = nonProdApplyDeptRepository.save(nonProdApplyDept);
}
@Override
public void distributeSapNonProdApplyDept(SDO sdo) {
this.saveSapNonProdApplyDept(sdo);
}
@Override
public SapNonProdApplyDept getNonProdApplyDeptById(String id) {
return nonProdApplyDeptRepository.findOne(id);
}
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyController.java
View file @ 8aeb857b
package com.huigou.topsun.sap.nonProdApply.controller; package com.huigou.topsun.sap.nonProdApply.controller;
import com.huigou.cache.DictUtil;
import com.huigou.context.Operator; import com.huigou.context.Operator;
import com.huigou.context.OrgUnit; import com.huigou.context.OrgUnit;
import com.huigou.topsun.sap.nonProdApply.application.NonProdApplyApplication; import com.huigou.topsun.sap.nonProdApply.application.NonProdApplyApplication;
...@@ -14,9 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -14,9 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.*;
import java.util.List;
import java.util.Map;
@Controller @Controller
@ControllerMapping("/sapNonProdApply") @ControllerMapping("/sapNonProdApply")
...@@ -71,12 +70,6 @@ public class NonProdApplyController extends CommonController { ...@@ -71,12 +70,6 @@ public class NonProdApplyController extends CommonController {
return success(); return success();
} }
public String forwardNonProdApplyNext(){
SDO sdo = this.getSDO();
String id = sdo.getBizId();
NonProdApplyBaseInfo nonProdApplyBaseInfo = nonProdApplyApplication.loadNonProdApplyBaseInfoById(id);
return forward("nonProdApplyNext",nonProdApplyBaseInfo);
}
} }
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyNextController.java 0 → 100644
View file @ 8aeb857b
package com.huigou.topsun.sap.nonProdApply.controller;
import com.huigou.cache.DictUtil;
import com.huigou.context.Operator;
import com.huigou.context.OrgUnit;
import com.huigou.topsun.proofing.domain.workInstructionApply.model.WorkInstructionApply;
import com.huigou.topsun.sap.nonProdApply.application.NonProdApplyApplication;
import com.huigou.topsun.sap.nonProdApply.application.NonProdApplyDeptApplication;
import com.huigou.topsun.sap.nonProdApply.domain.NonProdApplyBaseInfo;
import com.huigou.topsun.sap.nonProdApply.domain.SapNonProdApplyDept;
import com.huigou.topsun.sap.nonProdApply.domain.query.NonProdApplyBaseInfoQueryRequest;
import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.client.CommonController;
import com.huigou.util.SDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import java.util.*;
@Controller
@ControllerMapping("/sapNonProdApplyNext")
public class NonProdApplyNextController extends CommonController {
protected String getPagePath() {
return "/biz/topsun/sap/nonProdApply/";
}
@Autowired
NonProdApplyApplication nonProdApplyApplication;
@Autowired
NonProdApplyDeptApplication nonProdApplyDeptApplication;
public String forwardNonProdApplyNext(){
SDO sdo = this.getSDO();
String id = sdo.getBizId();
NonProdApplyBaseInfo nonProdApplyBaseInfo = nonProdApplyApplication.loadNonProdApplyBaseInfoById(id);
return forward("nonProdApplyNext",nonProdApplyBaseInfo);
}
public String slicedDeptList(){
SDO sdo = this.getSDO();
String septString = sdo.getString("dept");
List<String> deptList = Arrays.asList(septString.split(","));
Map<String, String> serviceusage = DictUtil.getDictionary("serviceusage");
// 用于存储结果的字典
Map<String, List<HashMap<String,String>>> map = new HashMap<>(); // 用于存储结果的字典
List<HashMap<String, String>> list = new ArrayList<>();
for (String key : deptList) {
HashMap<String, String> resultMap = new HashMap<>();
String value = serviceusage.get(key);
resultMap.put("deptCode",key);
resultMap.put("deptName", value);
list.add(resultMap);
}
map.put("Rows",list);
return toResult(map);
}
/**
* 添加指导申请书
*/
public String saveSapNonProdApplyDept(){
SDO sdo = this.getSDO();
SapNonProdApplyDept nonProdApplyDept = sdo.toObject(SapNonProdApplyDept.class);
nonProdApplyDeptApplication.saveSapNonProdApplyDept(sdo);
return toResult(nonProdApplyDept);
}
/**
* 分发表单
*/
public String distributeSapNonProdApplyDept(){
SDO sdo = this.getSDO();
SapNonProdApplyDept nonProdApplyDept = sdo.toObject(SapNonProdApplyDept.class);
// nonProdApplyDeptApplication.saveSapNonProdApplyDept(sdo);
return toResult(nonProdApplyDept);
}
/**
* 填写收到的任务表单
* @return
*/
public String fillInNonProdApplyDept(){
SDO sdo = this.getSDO();
String id = sdo.getBizId();
this.putAttribute("isReadOnly","false");
SapNonProdApplyDept nonProdApplyDept = nonProdApplyDeptApplication.getNonProdApplyDeptById(id);
return forward("nonProdApplyNext",nonProdApplyDept);
}
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/WorkflowApplicationImplOverride.java 0 → 100644
View file @ 8aeb857b
package com.huigou.topsun.sap.nonProdApply.controller;
import com.huigou.context.Operator;
import com.huigou.topsun.base.bsnMessage.appliction.BsnMessageApplication;
import com.huigou.topsun.base.bsnMessage.domain.query.BsnMessageQueryRequest;
import com.huigou.topsun.sap.statsIndicators.domain.query.SapStatsIndicatorsQueryRequest;
import com.huigou.uasp.bmp.opm.application.OrgApplication;
import com.huigou.uasp.bpm.BatchAdvanceParameter;
import com.huigou.uasp.bpm.TaskStatus;
import com.huigou.uasp.bpm.engine.application.ActApplication;
import com.huigou.uasp.bpm.engine.application.ProcUnitHandlerApplication;
import com.huigou.uasp.bpm.engine.application.impl.WorkflowApplicationImpl;
import com.huigou.uasp.bpm.engine.domain.model.CoordinationTask;
import com.huigou.uasp.bpm.engine.domain.model.ProcUnit;
import com.huigou.uasp.bpm.engine.domain.model.ProcUnitHandler;
import com.huigou.uasp.bpm.engine.domain.query.ProcunitHandlerQueryRequest;
import com.huigou.uasp.bpm.engine.domain.query.TaskDetail;
import com.huigou.util.SDO;
import org.activiti.engine.*;
import org.activiti.engine.impl.pvm.process.ActivityImpl;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.Comment;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Service;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 优先注入此类
*/
@Primary
@Service
public class WorkflowApplicationImplOverride extends WorkflowApplicationImpl {
@Autowired
BsnMessageApplication bsnMessageApplication;
@Override
public Map<String, Object> queryTrackingTasks() {
Operator operator = getOperator();//获取当前操作员的详情信息
return this.bsnMessageApplication.queryBsnMessage();
}
public WorkflowApplicationImplOverride() {
super();
}
@Override
public OrgApplication getOrgApplication() {
return super.getOrgApplication();
}
@Override
public ActApplication getActApplication() {
return super.getActApplication();
}
@Override
public void setRepositoryService(RepositoryService repositoryService) {
super.setRepositoryService(repositoryService);
}
@Override
public RepositoryService getRepositoryService() {
return super.getRepositoryService();
}
@Override
public void setFormService(FormService formService) {
super.setFormService(formService);
}
@Override
public FormService getFormService() {
return super.getFormService();
}
@Override
public void setRuntimeService(RuntimeService runtimeService) {
super.setRuntimeService(runtimeService);
}
@Override
public RuntimeService getRunTimeService() {
return super.getRunTimeService();
}
@Override
public void setTaskService(TaskService taskService) {
super.setTaskService(taskService);
}
@Override
public TaskService getTaskService() {
return super.getTaskService();
}
@Override
public void setManagementService(ManagementService managementService) {
super.setManagementService(managementService);
}
@Override
public void setHistoryService(HistoryService historyService) {
super.setHistoryService(historyService);
}
@Override
public HistoryService getHistoryService() {
return super.getHistoryService();
}
@Override
public ProcUnitHandlerApplication getProcUnitHandlerService() {
return super.getProcUnitHandlerService();
}
@Override
public void deploy(String procId, String fileName) {
super.deploy(procId, fileName);
}
@Override
public ProcessInstance startAndAdvanceProcessInstanceByKey(String processDefinitionKey, String businessKey, Map<String, Object> variables) {
return super.startAndAdvanceProcessInstanceByKey(processDefinitionKey, businessKey, variables);
}
@Override
public ProcessInstance startAndAdvanceProcessInstanceByKeyInNewTransaction(String processDefinitionKey, String businessKey, Map<String, Object> variables) {
return super.startAndAdvanceProcessInstanceByKeyInNewTransaction(processDefinitionKey, businessKey, variables);
}
@Override
public ProcessInstance startProcessInstanceByKey(String processDefinitionKey, String businessKey, Map<String, Object> variables) {
return super.startProcessInstanceByKey(processDefinitionKey, businessKey, variables);
}
@Override
public ProcessInstance startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables) {
return super.startProcessInstanceByKey(processDefinitionKey, variables);
}
@Override
public void saveBizData(String bizId, String taskId) {
super.saveBizData(bizId, taskId);
}
@Override
public Boolean showQueryHandlers(String bizId, String processDefinitionKey, String procUnitId, Integer groupId, String procUnitHandlerId) {
return super.showQueryHandlers(bizId, processDefinitionKey, procUnitId, groupId, procUnitHandlerId);
}
@Override
public Map<String, Object> queryHandlers(String bizId, String taskId) {
return super.queryHandlers(bizId, taskId);
}
@Override
public void advance(String taskId, Map<String, Object> variables) {
super.advance(taskId, variables);
}
@Override
public void batchAdvance(List<BatchAdvanceParameter> batchAdvanceParameters) {
super.batchAdvance(batchAdvanceParameters);
}
@Override
public void completeTask(String taskId) {
super.completeTask(taskId);
}
@Override
public void deleteTask(String taskId) {
super.deleteTask(taskId);
}
@Override
public void updateTaskDescription(String taskId, String description) {
super.updateTaskDescription(taskId, description);
}
@Override
public void updateTasksDescription(Map<String, Object> params) {
super.updateTasksDescription(params);
}
@Override
public void completeMendTask(String bizId, String taskId) {
super.completeMendTask(bizId, taskId);
}
@Override
public void completeReplenishTask(String bizId, String taskId) {
super.completeReplenishTask(bizId, taskId);
}
@Override
public void abortTask(String taskId) {
super.abortTask(taskId);
}
@Override
public void abortProcessInstance(String processInstanceId) {
super.abortProcessInstance(processInstanceId);
}
@Override
public void abortProcessInstanceByBizId(String bizId) {
super.abortProcessInstanceByBizId(bizId);
}
@Override
public void abortProcessInstanceByBizCode(String bizCode) {
super.abortProcessInstanceByBizCode(bizCode);
}
@Override
public void suspendTask(String taskId) {
super.suspendTask(taskId);
}
@Override
public void recoverTask(String taskId) {
super.recoverTask(taskId);
}
@Override
public void sleep(String taskId) {
super.sleep(taskId);
}
@Override
public void deleteProcessInstance(String processInstanceId, String deleteReason) {
super.deleteProcessInstance(processInstanceId, deleteReason);
}
@Override
public void recallProcessInstance(String processInstanceId, String taskId) {
super.recallProcessInstance(processInstanceId, taskId);
}
@Override
public void back(String taskId, String destActivityId, String backToProcUnitHandlerId) {
super.back(taskId, destActivityId, backToProcUnitHandlerId);
}
@Override
public void backToApplyActivity(String taskId, String processInstanceId) {
super.backToApplyActivity(taskId, processInstanceId);
}
@Override
public List<ActivityImpl> queryBackActivity(String taskId) {
return super.queryBackActivity(taskId);
}
@Override
public void withdrawTask(String taskId, String previousId) {
super.withdrawTask(taskId, previousId);
}
@Override
public void withdrawTaskByBizId(String taskId, String bizId) {
super.withdrawTaskByBizId(taskId, bizId);
}
@Override
public void transmit(String catalogId, String taskId, String procUnitHandlerId, String executorId, Integer sendMessage) {
super.transmit(catalogId, taskId, procUnitHandlerId, executorId, sendMessage);
}
@Override
public void assign(String taskId, String procUnitHandlerId, List<String> personMemberIds) {
super.assign(taskId, procUnitHandlerId, personMemberIds);
}
@Override
public void claim(String taskId, String personMemberId) {
super.claim(taskId, personMemberId);
}
@Override
public void makeACopyForEvent(String taskId, List<String> executorIds) {
super.makeACopyForEvent(taskId, executorIds);
}
@Override
public void makeACopyFor(String taskId, List<String> executorIds) {
super.makeACopyFor(taskId, executorIds);
}
@Override
public void makeACopyFor(String taskId, List<String> executorIds, String description) {
super.makeACopyFor(taskId, executorIds, description);
}
@Override
public void createNoticeTask(String procUnitName, String description, List<String> executorIds) {
super.createNoticeTask(procUnitName, description, executorIds);
}
@Override
public void createNoticeTask(String procUnitName, String description, List<String> executorIds, String formKey, String businessKey) {
super.createNoticeTask(procUnitName, description, executorIds, formKey, businessKey);
}
@Override
public void doCreateCoordinationTask(CoordinationTask coordinationTask) {
super.doCreateCoordinationTask(coordinationTask);
}
@Override
public void createCoordinationTask(CoordinationTask coordinationTask) {
super.createCoordinationTask(coordinationTask);
}
@Override
public List<ProcUnit> getAllProcessDefinitions() {
return super.getAllProcessDefinitions();
}
@Override
public List<ProcUnit> getUserTaskActivitiesByProcessDefinitionId(String processDefinitionId) {
return super.getUserTaskActivitiesByProcessDefinitionId(processDefinitionId);
}
@Override
public TaskDetail queryTaskDetail(String taskId) {
return super.queryTaskDetail(taskId);
}
@Override
public Map<String, Object> queryTasks(SDO params) {
return super.queryTasks(params);
}
@Override
public List<?> queryFlowChartProcedure(String bizId) {
return super.queryFlowChartProcedure(bizId);
}
@Override
public Map<String, Object> queryFlowChart(String bizId, String ownerOrgId, String isShowAllRules) {
return super.queryFlowChart(bizId, ownerOrgId, isShowAllRules);
}
@Override
public Map<String, Object> getProcedureInfo(String bizId, String procUnitHandlerId) {
return super.getProcedureInfo(bizId, procUnitHandlerId);
}
@Override
public Map<String, Object> queryApprovalHistoryByBizId(String bizId) {
return super.queryApprovalHistoryByBizId(bizId);
}
@Override
public Map<String, Object> queryBackTasksByBizCode(String bizCode, String procUnitId, Integer groupId) {
return super.queryBackTasksByBizCode(bizCode, procUnitId, groupId);
}
@Override
public Map<String, Object> queryBackTasksByBizId(String bizId, String procUnitId, Integer groupId) {
return super.queryBackTasksByBizId(bizId, procUnitId, groupId);
}
@Override
public Map<String, Object> queryBackProcUnit(String procInstId, String approvalRuleId, Integer groupId) {
return super.queryBackProcUnit(procInstId, approvalRuleId, groupId);
}
@Override
public Map<String, Object> queryCounterSignHandlers(String bizId, String procUnitId) {
return super.queryCounterSignHandlers(bizId, procUnitId);
}
@Override
public void saveCounterSignHandlers(String bizId, String procUnitId, Long version, String currentProcUnitHandlerId, List<String> minusSignIds, List<ProcUnitHandler> countersigns) {
super.saveCounterSignHandlers(bizId, procUnitId, version, currentProcUnitHandlerId, minusSignIds, countersigns);
}
@Override
public List<ProcUnitHandler> queryAssistHandlers(String bizId, String procUnitId, String chiefId) {
return super.queryAssistHandlers(bizId, procUnitId, chiefId);
}
@Override
public void assist(String bizId, String taskId, String procUnitHandlerId, List<String> deletedIds, List<String> executorIds, List<Integer> sendMessages) {
super.assist(bizId, taskId, procUnitHandlerId, deletedIds, executorIds, sendMessages);
}
@Override
public List<Map<String, Object>> queryUIElmentPermissionsByProcUnitHandlerId(String id) {
return super.queryUIElmentPermissionsByProcUnitHandlerId(id);
}
@Override
public void updateHistoricTaskInstanceStatus(String taskId, String status) {
super.updateHistoricTaskInstanceStatus(taskId, status);
}
@Override
public void updateTaskExtensionStatus(String taskId, TaskStatus taskStatus) {
super.updateTaskExtensionStatus(taskId, taskStatus);
}
@Override
public void launchMendTask(String bizId, String procUnitId) {
super.launchMendTask(bizId, procUnitId);
}
@Override
public void mend(String bizId, String procUnitId, String currentProcUnitHandlerId, Long version, List<ProcUnitHandler> countersigns) {
super.mend(bizId, procUnitId, currentProcUnitHandlerId, version, countersigns);
}
@Override
public void replenish(String backToTaskId, String currentTaskId, String procUnitHandlerId) {
super.replenish(backToTaskId, currentTaskId, procUnitHandlerId);
}
@Override
public String saveComment(String procUnitHandlerId, String bizId, String message) {
return super.saveComment(procUnitHandlerId, bizId, message);
}
@Override
public List<Comment> queryProcUnitHandlerComments(String procUnitHandlerId) {
return super.queryProcUnitHandlerComments(procUnitHandlerId);
}
@Override
public List<ActivityImpl> queryProcessInstanceActiveActivities(String procInstId) {
return super.queryProcessInstanceActiveActivities(procInstId);
}
@Override
public void handTasks(String fromPersonId, String toPsmId) {
super.handTasks(fromPersonId, toPsmId);
}
@Override
public void collectTask(String taskId) {
super.collectTask(taskId);
}
@Override
public void cancelCollectionTask(String taskId) {
super.cancelCollectionTask(taskId);
}
@Override
public Map<String, Object> queryCurrentOperatorTaskStatistics() {
return super.queryCurrentOperatorTaskStatistics();
}
@Override
public String findBpmnDelegateClassCanonicalName(String taskId) {
return super.findBpmnDelegateClassCanonicalName(taskId);
}
@Override
public Boolean checkAssistantPassRule(String processDefinitionKey, String taskDefinitionKey, String bizId, String procUnitHandlerId) {
return super.checkAssistantPassRule(processDefinitionKey, taskDefinitionKey, bizId, procUnitHandlerId);
}
@Override
public Map<String, Object> loadRuntimeTaskByBizId(String bizId) {
return super.loadRuntimeTaskByBizId(bizId);
}
@Override
public Map<String, Object> slicedQueryProcunitHandler(ProcunitHandlerQueryRequest queryRequest) {
return super.slicedQueryProcunitHandler(queryRequest);
}
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/test.java 0 → 100644
View file @ 8aeb857b
package com.huigou.topsun.sap.nonProdApply.controller;
import com.huigou.uasp.bmp.portal.mainpage.controller.HomePageController;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Controller;
//@Controller
//@Primary
public class test extends HomePageController {
public test() {
super();
}
@Override
public String execute() throws Exception {
return super.execute();
}
@Override
public String queryAllTasks() {
return super.queryAllTasks();
}
@Override
public String queryTasksByViewKind() {
return super.queryTasksByViewKind();
}
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/deptJson.json 0 → 100644
View file @ 8aeb857b
[
{
"deptkey": "基本数据",
"deptVal": "K"
},
{
"deptkey": "分类",
"deptVal": "C"
},
{
"deptkey": "销售",
"deptVal": "V"
},
{
"deptkey": "采购",
"deptVal": "E"
},
{
"deptkey": "MRP",
"deptVal": "D"
},
{
"deptkey": "生产",
"deptVal": "A"
},
{
"deptkey": "存储管理",
"deptVal": "L"
},
{
"deptkey": "仓库管理",
"deptVal": "S"
},
{
"deptkey": "质量管理",
"deptVal": "Q"
},
{
"deptkey": "财务核算",
"deptVal": "B"
},
{
"deptkey": "成本核算",
"deptVal": "G"
}
]
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/deptStaffJson.json 0 → 100644
View file @ 8aeb857b
[
{
"userCode": "123456789",
"userName": "基本数据测试人员1",
"deptCode": "K"
}
]
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/repository/NonProdApplyDeptRepository.java 0 → 100644
View file @ 8aeb857b
package com.huigou.topsun.sap.nonProdApply.repository;
import com.huigou.topsun.sap.nonProdApply.domain.SapNonProdApplyDept;
import org.springframework.data.jpa.repository.JpaRepository;
public interface NonProdApplyDeptRepository extends JpaRepository<SapNonProdApplyDept,String> {
}
topsun/src/main/java/com/huigou/topsun/sap/priceMasterData/domain/BsnMessage.java 0 → 100644
View file @ 8aeb857b
package com.huigou.topsun.sap.priceMasterData.domain;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
/**
*
* @TableName bsn_message
*/
@Table(name="bsn_message")
@Entity
@Data
public class BsnMessage implements Serializable {
/**
*
*/
@Id
private String id;
/**
* 任务描述
*/
private String title;
/**
* 任务执行人
*/
private String listners;
/**
* 业务应用类型
*/
@Column(name = "business_code")
private String businessCode;
/**
* 业务表单id
*/
@Column(name = "business_id")
private String businessId;
/**
* 创建日期
*/
@Column(name = "create_date")
private Date createDate;
/**
* 完成日期
*/
@Column(name = "finished_date")
private Date finishedDate;
/**
* 完成状态（默认为未完成：0，完成为：1，保存未分发：2）
*/
private Integer active;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/purchase/controller/SapPurchaseApprovalController.java
View file @ 8aeb857b
package com.huigou.topsun.sap.purchase.controller; //package com.huigou.topsun.sap.purchase.controller;
//
import com.huigou.uasp.annotation.ControllerMapping; //import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.annotation.SkipAuth; //import com.huigou.uasp.annotation.SkipAuth;
import com.huigou.uasp.client.CommonController; //import com.huigou.uasp.client.CommonController;
import com.huigou.util.JSONUtil; //import com.huigou.util.JSONUtil;
import com.huigou.util.SDO; //import com.huigou.util.SDO;
import org.springframework.stereotype.Controller; //import org.springframework.stereotype.Controller;
//
import java.util.HashMap; //import java.util.HashMap;
//
/** ///**
* @Auther: xin.lu // * @Auther: xin.lu
* @Date: 2024/01/05/15:01 // * @Date: 2024/01/05/15:01
* @Description: // * @Description:
*/ // */
@Controller //@Controller
@ControllerMapping("/sapPurchaseApproval") //@ControllerMapping("/sapPurchaseApproval")
public class SapPurchaseApprovalController extends CommonController { //public class SapPurchaseApprovalController extends CommonController {
//
@SkipAuth // @SkipAuth
public String getSapPurchaseApproval(){ // public String getSapPurchaseApproval(){
SDO sdo = this.getSDO(); // SDO sdo = this.getSDO();
HashMap<String, Object> messageMap = new HashMap<>(); // HashMap<String, Object> messageMap = new HashMap<>();
messageMap.put("Message_Status","S"); // messageMap.put("Message_Status","S");
messageMap.put("Message_Text","成功"); // messageMap.put("Message_Text","成功");
return toResult(messageMap); // return toResult(messageMap);
} // }
} //}
topsun/src/main/resources/config/topsun/base/bsnMessage.xml 0 → 100644
View file @ 8aeb857b
<?xml version="1.0" encoding="UTF-8"?>
<query-mappings>
<query name="queryBsnMessage" label="bsn业务人员表" table="bsn_message">
<sql-query>
select t.*
from bsn_message t where t.active=0
</sql-query>
<condition column="listners" name="listners" type="java.lang.String" symbol="=" alias="t"/>
</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