Skip to content

A
apps-collaboration
Commit d47a6ed2 authored by gaoyingwei's avatar gaoyingwei
Browse files
Options

update:修改 下单表单简化流程(加其他）、添加两个模板

parent 63835794
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 50 deletions
src/main/java/com/seeyon/apps/collaboration/controller/CollaborationController.java
View file @ d47a6ed2
......@@ -2362,7 +2362,8 @@ public class CollaborationController extends BaseController {
// 判断是外部调用校稿的流程,属于校稿流程，并是最后一个节点，调用门户接口
boolean isFinished = Integer.valueOf(CollaborationEnum.flowState.finish.ordinal()).equals(summary.getState())
||Integer.valueOf(CollaborationEnum.flowState.terminate.ordinal()).equals(summary.getState());
if("XDLC".equals(ctpTemplate.getTempleteNumber()) || "ECXDLC".equals(ctpTemplate.getTempleteNumber())) {
if("XDLC".equals(ctpTemplate.getTempleteNumber()) || "ECXDLC".equals(ctpTemplate.getTempleteNumber())
|| "XXDLC".equals(ctpTemplate.getTempleteNumber())) {
Long formappid = summary.getFormAppid() ;
Long formrecordid = summary.getFormRecordid() ;
FormBean formBean = cap4FormManager.getForm(formappid, false) ;
......@@ -2410,7 +2411,8 @@ public class CollaborationController extends BaseController {
}
// 判断是外部调用下单的流程
if(("XDLC".equals(ctpTemplate.getTempleteNumber()) || "XDLCQT".equals(ctpTemplate.getTempleteNumber()) ||
"ECXDLC".equals(ctpTemplate.getTempleteNumber()) || "ECXDLCQT".equals(ctpTemplate.getTempleteNumber())) && isFinished){
"ECXDLC".equals(ctpTemplate.getTempleteNumber()) || "ECXDLCQT".equals(ctpTemplate.getTempleteNumber())
||"XXDLC".equals(ctpTemplate.getTempleteNumber()) || "XXDLCQT".equals(ctpTemplate.getTempleteNumber())) && isFinished){
String filePath = SystemEnvironment.getApplicationFolder() + File.separator + "fkmap" + File.separator + "url.properties" ;
InputStream in = new BufferedInputStream(new FileInputStream(filePath));
Properties p = new Properties();
......@@ -2429,7 +2431,8 @@ public class CollaborationController extends BaseController {
String danjiaprice = master.getFormTable().getFieldMap4Display().get("单价").getName();
BigDecimal sumprice1 = new BigDecimal("0");
BigDecimal price = new BigDecimal("0");
if("XDLC".equals(ctpTemplate.getTempleteNumber()) || "ECXDLC".equals(ctpTemplate.getTempleteNumber()))
if("XDLC".equals(ctpTemplate.getTempleteNumber()) || "ECXDLC".equals(ctpTemplate.getTempleteNumber())
||"XXDLC".equals(ctpTemplate.getTempleteNumber()))
{
String zjvalue = request.getParameter("zj");
String djvalue = request.getParameter("dj");
......@@ -2571,35 +2574,36 @@ public class CollaborationController extends BaseController {
// String namekeyunitprice = master.getFormTable().getFieldMap4Display().get("单价").getName();
// BigDecimal unitprice = (BigDecimal)master.getAllDataMap().get(namekeyunitprice);
/** 注释返回给门户确认流程
try {
List<HttpMessageConverter<?>> list = restTemplate.getMessageConverters();
for (int i = 0; i < list.size(); i++) {
HttpMessageConverter<?> httpMessageConverter = list.get(i);
if (httpMessageConverter.getClass().equals(StringHttpMessageConverter.class)) {
list.set(i, new StringHttpMessageConverter(Charset.forName("utf-8")));
}
}
if (!"XXDLC".equals(ctpTemplate.getTempleteNumber())&&!"XXDLCQT".equals(ctpTemplate.getTempleteNumber())) {
try {
List<HttpMessageConverter<?>> list = restTemplate.getMessageConverters();
for (int i = 0; i < list.size(); i++) {
HttpMessageConverter<?> httpMessageConverter = list.get(i);
if (httpMessageConverter.getClass().equals(StringHttpMessageConverter.class)) {
list.set(i, new StringHttpMessageConverter(Charset.forName("utf-8")));
}
}
// restTemplate.getMessageConverters().add(new StringHttpMessageConverter(Charset.forName("utf-8")));
Map<String, Object> respnose = restTemplate.postForObject(DIC_DATA_URL, null, Map.class);
if(!(Boolean) respnose.get("success")){
colManager.updateColSummaryGeneralStateBySource(code,5);
Map<String, Object> respnose = restTemplate.postForObject(DIC_DATA_URL, null, Map.class);
if (!(Boolean) respnose.get("success")) {
colManager.updateColSummaryGeneralStateBySource(code, 5);
}
} catch (Exception e) {
colManager.updateColSummaryGeneralStateBySource(code, 5);
}
} catch(Exception e){
colManager.updateColSummaryGeneralStateBySource(code,5);
}
*/
colManager.updateColSummaryGeneralStateBySource(code,1);
DIC_DATA_URL = url + "/signprintmessage/oaSetPrintStatus";
DIC_DATA_URL = DIC_DATA_URL+"?printId="+code+"&printStatus=1";
try {
Map<String, Object> respnose = restTemplate.postForObject(DIC_DATA_URL, null, Map.class);
if(!(Boolean) respnose.get("success")){
colManager.updateColSummaryGeneralStateBySource(code,5);
} else {
colManager.updateColSummaryGeneralStateBySource(code, 1);
DIC_DATA_URL = url + "/signprintmessage/oaSetPrintStatus";
DIC_DATA_URL = DIC_DATA_URL + "?printId=" + code + "&printStatus=1";
try {
Map<String, Object> respnose = restTemplate.postForObject(DIC_DATA_URL, null, Map.class);
if (!(Boolean) respnose.get("success")) {
colManager.updateColSummaryGeneralStateBySource(code, 5);
}
} catch (Exception e) {
colManager.updateColSummaryGeneralStateBySource(code, 5);
}
} catch(Exception e){
colManager.updateColSummaryGeneralStateBySource(code,5);
}
}
}
......@@ -2830,7 +2834,9 @@ public class CollaborationController extends BaseController {
} catch(Exception e){
colManager.updateColSummaryGeneralStateBySource(code,6);
}
} else if (null != ctpTemplate.getTempleteNumber() && "XDLC".equals(ctpTemplate.getTempleteNumber())){
} else if (null != ctpTemplate.getTempleteNumber() && ("XDLC".equals(ctpTemplate.getTempleteNumber())
||"XDLCQT".equals(ctpTemplate.getTempleteNumber())||"ECXDLC".equals(ctpTemplate.getTempleteNumber())
||"ECXDLCQT".equals(ctpTemplate.getTempleteNumber())|| "XXDLCQT".equals(ctpTemplate.getTempleteNumber()) ||"XXDLC".equals(ctpTemplate.getTempleteNumber()))){
String filePath = SystemEnvironment.getApplicationFolder() + File.separator + "fkmap" + File.separator + "url.properties" ;
InputStream in = new BufferedInputStream(new FileInputStream(filePath));
Properties p = new Properties();
......@@ -3956,12 +3962,16 @@ public class CollaborationController extends BaseController {
CtpTemplate ctpTemplate1 = templateManager.getTempleteByTemplateNumber("ECXDLC");
CtpTemplate ctpTemplate2 = templateManager.getTempleteByTemplateNumber("XDLCQT");
CtpTemplate ctpTemplate3 = templateManager.getTempleteByTemplateNumber("ECXDLCQT");
CtpTemplate ctpTemplate4 = templateManager.getTempleteByTemplateNumber("XXDLC");
CtpTemplate ctpTemplate5 = templateManager.getTempleteByTemplateNumber("XXDLCQT");
mav.addObject("userId", userId);
// mav.addObject("state", state);
mav.addObject("ctpTemplateId", ctpTemplate.getId());
mav.addObject("ctpTemplateId1", ctpTemplate1.getId());
mav.addObject("ctpTemplateId2", ctpTemplate2.getId());
mav.addObject("ctpTemplateId3", ctpTemplate3.getId());
mav.addObject("ctpTemplateId4", ctpTemplate4.getId());
mav.addObject("ctpTemplateId5", ctpTemplate5.getId());
return mav;
}
......@@ -3975,6 +3985,8 @@ public class CollaborationController extends BaseController {
params.put("ctpTemplateId1",Long.parseLong(request.getParameter("ctpTemplateId1")));
params.put("ctpTemplateId2",Long.parseLong(request.getParameter("ctpTemplateId2")));
params.put("ctpTemplateId3",Long.parseLong(request.getParameter("ctpTemplateId3")));
params.put("ctpTemplateId4",Long.parseLong(request.getParameter("ctpTemplateId4")));
params.put("ctpTemplateId5",Long.parseLong(request.getParameter("ctpTemplateId5")));
params.put("userId",Long.parseLong(request.getParameter("userId")));
params.put("orderState",Integer.valueOf(request.getParameter("orderState")));
fi = colManager.getOrderStateDetailList(fi,params);
......
src/main/java/com/seeyon/apps/collaboration/dao/ColDaoImpl.java
View file @ d47a6ed2
......@@ -4272,7 +4272,7 @@ public class ColDaoImpl extends BaseHibernateDao<ColSummary> implements ColDao {
// Map<String,Object> parameterMap = new HashMap<String, Object>();
hql.append("SELECT affair.objectId, affair.subject, summary.startMemberId, summary.createDate, affair.updateDate, summary.state, summary.generalState, summary.erpState ");
hql.append("FROM ColSummary summary, CtpAffair affair ");
hql.append("WHERE summary.id = affair.objectId AND summary.templeteId IN ( :ctpTemplateId, :ctpTemplateId1, :ctpTemplateId2, :ctpTemplateId3) " +
hql.append("WHERE summary.id = affair.objectId AND summary.templeteId IN ( :ctpTemplateId, :ctpTemplateId1, :ctpTemplateId2, :ctpTemplateId3, :ctpTemplateId4, :ctpTemplateId5) " +
"AND affair.state = :state " +
"AND affair.memberId = :userId ");
if ((parameterMap.get("orderState").toString()).equals("1")) //全部订单
......
src/main/java/com/seeyon/apps/collaboration/manager/ColManagerImpl.java
View file @ d47a6ed2
......@@ -11306,6 +11306,8 @@ public class ColManagerImpl implements ColManager {
map.put("ctpTemplateId1",Long.parseLong(map.get("ctpTemplateId1").toString()));
map.put("ctpTemplateId2",Long.parseLong(map.get("ctpTemplateId2").toString()));
map.put("ctpTemplateId3",Long.parseLong(map.get("ctpTemplateId3").toString()));
map.put("ctpTemplateId4",Long.parseLong(map.get("ctpTemplateId4").toString()));
map.put("ctpTemplateId5",Long.parseLong(map.get("ctpTemplateId5").toString()));
map.put("userId",Long.parseLong(map.get("userId").toString()));
map.put("orderState",Integer.valueOf(map.get("orderState").toString()));
List<OrderDetailVO> result = colDao.getOrderStateDetailList(flipInfo,map);
......
src/main/java/com/seeyon/apps/timer/FalseDoTimer.java
View file @ d47a6ed2
......@@ -129,7 +129,8 @@ public class FalseDoTimer {
//下单流程
} else if ("XDLC".equals(ctpTemplate.getTempleteNumber()) | "ECXDLC".equals(ctpTemplate.getTempleteNumber())
| "XDLCQT".equals(ctpTemplate.getTempleteNumber()) | "ECXDLCQT".equals(ctpTemplate.getTempleteNumber())) {
| "XDLCQT".equals(ctpTemplate.getTempleteNumber()) | "ECXDLCQT".equals(ctpTemplate.getTempleteNumber())
| "XXDLC".equals(ctpTemplate.getTempleteNumber())| "XXDLCQT".equals(ctpTemplate.getTempleteNumber())) {
if (oastate == 5) { //审核通过
String filePath = SystemEnvironment.getApplicationFolder() + File.separator + "fkmap" + File.separator + "url.properties" ;
InputStream in = new BufferedInputStream(new FileInputStream(filePath));
......@@ -259,7 +260,7 @@ public class FalseDoTimer {
}
DIC_DATA_URL = DIC_DATA_URL+"?id="+code+"&printStatus="+1+"&pageSize="+pageSize1+"&cover="+covers+"&coverSize="+coverSize1+"&nevinSize="+nevinSize1+"&insertSize="+insertSize1+"&machinetype="+machinetype1+"&distribution="+distribution1+"&pagesided="+pagesided1+"&urgent="+urgent1+"&aggregate="+totalprice+"&price="+unitprice+"&remark="+remarks+"&neivinColor="+neivinColor1;
}else {
}else if ("ECXDLCQT".equals(ctpTemplate.getTempleteNumber())| "XDLCQT".equals(ctpTemplate.getTempleteNumber())){
if ("ECXDLCQT".equals(ctpTemplate.getTempleteNumber())){
String namekeyyhprice = master.getFormTable().getFieldMap4Display().get("优惠价").getName();
totalprice = (BigDecimal)master.getAllDataMap().get(namekeyyhprice);
......@@ -272,20 +273,20 @@ public class FalseDoTimer {
// DIC_DATA_URL = DIC_DATA_URL + "?id=" + code + "&printStatus=" + 1 + "&pageSize=" + pageSize1 + "&cover=" + cover1 + "&coverSize=" + coverSize1 + "&nevinSize=" + nevinSize1 + "&insertSize=" + insertSize1 + "&machinetype=" + machinetype1 + "&distribution=" + distribution1 + "&pagesided=" + pagesided1 + "&urgent=" + urgent + "&aggregate=" + totalprice + "&price=" + unitprice + "&remark=" + remarks;
/** 注释返回给门户确认流程 respnose = restTemplate.postForObject(DIC_DATA_URL, null, Map.class);
String succ=respnose.get("success").toString();
if (Strings.isNotBlank(succ)&&"true".equals(succ)) {
colManager.updateColSummaryGeneralStateBySource(code, 0);
}
*/
DIC_DATA_URL = url + "/signprintmessage/oaSetPrintStatus";
DIC_DATA_URL = DIC_DATA_URL+"?printId="+code+"&printStatus=1";
respnose = restTemplate.postForObject(DIC_DATA_URL, null, Map.class);
String succ=respnose.get("success").toString();
if (Strings.isNotBlank(succ)&&"true".equals(succ)) {
colManager.updateColSummaryGeneralStateBySource(code, 1);
if (!"XXDLC".equals(ctpTemplate.getTempleteNumber())&& !"XXDLCQT".equals(ctpTemplate.getTempleteNumber())) {
respnose = restTemplate.postForObject(DIC_DATA_URL, null, Map.class);
String succ = respnose.get("success").toString();
if (Strings.isNotBlank(succ) && "true".equals(succ)) {
colManager.updateColSummaryGeneralStateBySource(code, 0);
}
}else {
DIC_DATA_URL = url + "/signprintmessage/oaSetPrintStatus";
DIC_DATA_URL = DIC_DATA_URL + "?printId=" + code + "&printStatus=1";
respnose = restTemplate.postForObject(DIC_DATA_URL, null, Map.class);
String succ = respnose.get("success").toString();
if (Strings.isNotBlank(succ) && "true".equals(succ)) {
colManager.updateColSummaryGeneralStateBySource(code, 1);
}
}
} else if (oastate == 6) { //终止流程
......
src/main/java/com/seeyon/ctp/rest/resources/CollaborationResource.java
View file @ d47a6ed2
......@@ -7796,7 +7796,8 @@ public class CollaborationResource extends BaseResource {
}
}
if (param.get("templateCode").equals("XDLC") || param.get("templateCode").equals("ECXDLC")
|| param.get("templateCode").equals("XDLCQT") || param.get("templateCode").equals("ECXDLCQT")) {
|| param.get("templateCode").equals("XDLCQT") || param.get("templateCode").equals("ECXDLCQT")
||param.get("templateCode").equals("XXDLC")||param.get("templateCode").equals("XXDLCQT")) {
LOGGER.info("-----------------urgent:"+main.get("urgent"));
if (main.get("urgent").toString().equals("0")) {
main.put("urgent", "特急(<4H)");
......@@ -7807,7 +7808,8 @@ public class CollaborationResource extends BaseResource {
}
LOGGER.info("-------------------urgent:"+main.get("urgent"));
}
if (param.get("templateCode").equals("XDLC") || param.get("templateCode").equals("ECXDLC")) {
if (param.get("templateCode").equals("XDLC") || param.get("templateCode").equals("ECXDLC")
||param.get("templateCode").equals("XXDLC")) {
String cover = (String) main.get("cover");
String[] covers = cover.split(",");
main.put("cover","0");
......@@ -8320,7 +8322,8 @@ public class CollaborationResource extends BaseResource {
String businessRemark = (String)master.getAllDataMap().get(namekeybusinessRemark);
printdata.setBusinessRemark(businessRemark);
if (template.getTempleteNumber().equals("XDLC") || template.getTempleteNumber().equals("ECXDLC")){
if (template.getTempleteNumber().equals("XDLC") || template.getTempleteNumber().equals("ECXDLC")
||template.getTempleteNumber().equals("XXDLC")){
String printtype = master.getFormTable().getFieldMap4Display().get("印品类型").getName();
String type = (String)master.getAllDataMap().get(printtype);
if(StringUtils.isNotBlank(type)) {
......
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