Skip to content

S
Skyeye

Skyeye云 / Skyeye

通知 1435
Star 162
Fork 130
S
Skyeye
提交 7b84eeb8 编写于 作者: Skyeye云's avatar Skyeye云
浏览文件
操作

商机审核，证照借用，证照归还，项目费用报销，项目文档审核，项目立项，项目任务，项目工作量申请申请提交工作流选择审批人修改

上级 664926db
隐藏空白更改
内联 并排
Showing with 181 addition and 595 deletion
skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/LicenceApplyBorrowController.java
浏览文件 @ 7b84eeb8
...@@ -105,22 +105,6 @@ public class LicenceApplyBorrowController { ...@@ -105,22 +105,6 @@ public class LicenceApplyBorrowController {
licenceApplyBorrowService.updateBorrowLicenceMationById(inputObject, outputObject); licenceApplyBorrowService.updateBorrowLicenceMationById(inputObject, outputObject);
} }
/**
*
* @Title: updateBorrowLicenceMationToSave
* @Description: 编辑证照借用申请（已提交审批）
* @param inputObject
* @param outputObject
* @throws Exception 参数
* @return void 返回类型
* @throws
*/
@RequestMapping("/post/LicenceApplyBorrowController/updateBorrowLicenceMationToSave")
@ResponseBody
public void updateBorrowLicenceMationToSave(InputObject inputObject, OutputObject outputObject) throws Exception{
licenceApplyBorrowService.updateBorrowLicenceMationToSave(inputObject, outputObject);
}
/** /**
* *
* @Title: editBorrowLicenceToSubApproval * @Title: editBorrowLicenceToSubApproval
......
skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/LicenceApplyRevertController.java
浏览文件 @ 7b84eeb8
...@@ -106,22 +106,6 @@ public class LicenceApplyRevertController { ...@@ -106,22 +106,6 @@ public class LicenceApplyRevertController {
licenceApplyRevertService.updateRevertLicenceMationById(inputObject, outputObject); licenceApplyRevertService.updateRevertLicenceMationById(inputObject, outputObject);
} }
/**
*
* @Title: updateRevertLicenceMationToSave
* @Description: 编辑证照归还申请
* @param inputObject
* @param outputObject
* @throws Exception 参数
* @return void 返回类型
* @throws
*/
@RequestMapping("/post/LicenceApplyRevertController/updateRevertLicenceMationToSave")
@ResponseBody
public void updateRevertLicenceMationToSave(InputObject inputObject, OutputObject outputObject) throws Exception{
licenceApplyRevertService.updateRevertLicenceMationToSave(inputObject, outputObject);
}
/** /**
* *
* @Title: editRevertLicenceToSubApproval * @Title: editRevertLicenceToSubApproval
......
skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/LicenceApplyBorrowService.java
浏览文件 @ 7b84eeb8
...@@ -27,8 +27,6 @@ public interface LicenceApplyBorrowService { ...@@ -27,8 +27,6 @@ public interface LicenceApplyBorrowService {
public void updateBorrowLicenceMationById(InputObject inputObject, OutputObject outputObject) throws Exception; public void updateBorrowLicenceMationById(InputObject inputObject, OutputObject outputObject) throws Exception;
public void updateBorrowLicenceMationToSave(InputObject inputObject, OutputObject outputObject) throws Exception;
public void editBorrowLicenceToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception; public void editBorrowLicenceToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception;
public void updateBorrowLicenceToCancellation(InputObject inputObject, OutputObject outputObject) throws Exception; public void updateBorrowLicenceToCancellation(InputObject inputObject, OutputObject outputObject) throws Exception;
......
skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/LicenceApplyRevertService.java
浏览文件 @ 7b84eeb8
...@@ -27,8 +27,6 @@ public interface LicenceApplyRevertService { ...@@ -27,8 +27,6 @@ public interface LicenceApplyRevertService {
public void updateRevertLicenceMationById(InputObject inputObject, OutputObject outputObject) throws Exception; public void updateRevertLicenceMationById(InputObject inputObject, OutputObject outputObject) throws Exception;
public void updateRevertLicenceMationToSave(InputObject inputObject, OutputObject outputObject) throws Exception;
public void editRevertLicenceToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception; public void editRevertLicenceToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception;
public void updateRevertLicenceToCancellation(InputObject inputObject, OutputObject outputObject) throws Exception; public void updateRevertLicenceToCancellation(InputObject inputObject, OutputObject outputObject) throws Exception;
......
skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/LicenceApplyBorrowServiceImpl.java
浏览文件 @ 7b84eeb8
...@@ -6,6 +6,8 @@ package com.skyeye.eve.service.impl; ...@@ -6,6 +6,8 @@ package com.skyeye.eve.service.impl;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.skyeye.activiti.factory.ActivitiRunFactory; import com.skyeye.activiti.factory.ActivitiRunFactory;
import com.skyeye.activiti.service.ActivitiUserService;
import com.skyeye.annotation.transaction.ActivitiAndBaseTransaction;
import com.skyeye.common.constans.ActivitiConstants; import com.skyeye.common.constans.ActivitiConstants;
import com.skyeye.common.constans.AdminAssistantConstants; import com.skyeye.common.constans.AdminAssistantConstants;
import com.skyeye.common.object.InputObject; import com.skyeye.common.object.InputObject;
...@@ -44,6 +46,9 @@ public class LicenceApplyBorrowServiceImpl implements LicenceApplyBorrowService ...@@ -44,6 +46,9 @@ public class LicenceApplyBorrowServiceImpl implements LicenceApplyBorrowService
@Autowired @Autowired
private SysEnclosureDao sysEnclosureDao; private SysEnclosureDao sysEnclosureDao;
@Autowired
private ActivitiUserService activitiUserService;
/** /**
* 证照借用关联的工作流的key * 证照借用关联的工作流的key
*/ */
...@@ -59,7 +64,6 @@ public class LicenceApplyBorrowServiceImpl implements LicenceApplyBorrowService ...@@ -59,7 +64,6 @@ public class LicenceApplyBorrowServiceImpl implements LicenceApplyBorrowService
* @return void 返回类型 * @return void 返回类型
* @throws * @throws
*/ */
@SuppressWarnings("unchecked")
@Override @Override
public void queryMyBorrowLicenceList(InputObject inputObject, OutputObject outputObject) throws Exception { public void queryMyBorrowLicenceList(InputObject inputObject, OutputObject outputObject) throws Exception {
ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_LICENCE_USE_PAGE_KEY).queryWithActivitiList(); ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_LICENCE_USE_PAGE_KEY).queryWithActivitiList();
...@@ -76,7 +80,7 @@ public class LicenceApplyBorrowServiceImpl implements LicenceApplyBorrowService ...@@ -76,7 +80,7 @@ public class LicenceApplyBorrowServiceImpl implements LicenceApplyBorrowService
* @throws * @throws
*/ */
@Override @Override
@Transactional(value="transactionManager") @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void insertBorrowLicenceMation(InputObject inputObject, OutputObject outputObject) throws Exception { public void insertBorrowLicenceMation(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
String useId = ToolUtil.getSurFaceId();//借用单主表id String useId = ToolUtil.getSurFaceId();//借用单主表id
...@@ -95,11 +99,9 @@ public class LicenceApplyBorrowServiceImpl implements LicenceApplyBorrowService ...@@ -95,11 +99,9 @@ public class LicenceApplyBorrowServiceImpl implements LicenceApplyBorrowService
map.put("createTime", DateUtil.getTimeAndToString()); map.put("createTime", DateUtil.getTimeAndToString());
licenceApplyBorrowDao.insertLicenceBorrowMation(map); licenceApplyBorrowDao.insertLicenceBorrowMation(map);
licenceApplyBorrowDao.insertLicenceBorrowGoodsMation(entitys); licenceApplyBorrowDao.insertLicenceBorrowGoodsMation(entitys);
// 判断是否提交审批 // 操作工作流数据
if("2".equals(subType)){ activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
// 提交审批 ACTIVITI_LICENCE_USE_PAGE_KEY, useId, map.get("approvalId").toString());
ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_LICENCE_USE_PAGE_KEY).submitToActivi(useId, ActivitiConstants.APPROVAL_ID);
}
} }
private List<Map<String, Object>> getLicenceList(String paramsStr, String useId, String state) throws Exception { private List<Map<String, Object>> getLicenceList(String paramsStr, String useId, String state) throws Exception {
...@@ -159,7 +161,6 @@ public class LicenceApplyBorrowServiceImpl implements LicenceApplyBorrowService ...@@ -159,7 +161,6 @@ public class LicenceApplyBorrowServiceImpl implements LicenceApplyBorrowService
* @return void 返回类型 * @return void 返回类型
* @throws * @throws
*/ */
@SuppressWarnings("unchecked")
@Override @Override
public void queryBorrowLicenceMationToEdit(InputObject inputObject, OutputObject outputObject) throws Exception { public void queryBorrowLicenceMationToEdit(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
...@@ -183,9 +184,8 @@ public class LicenceApplyBorrowServiceImpl implements LicenceApplyBorrowService ...@@ -183,9 +184,8 @@ public class LicenceApplyBorrowServiceImpl implements LicenceApplyBorrowService
* @return void 返回类型 * @return void 返回类型
* @throws * @throws
*/ */
@SuppressWarnings("unchecked")
@Override @Override
@Transactional(value="transactionManager") @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void updateBorrowLicenceMationById(InputObject inputObject, OutputObject outputObject) throws Exception { public void updateBorrowLicenceMationById(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
String useId = map.get("id").toString();//借用单主表id String useId = map.get("id").toString();//借用单主表id
...@@ -199,38 +199,9 @@ public class LicenceApplyBorrowServiceImpl implements LicenceApplyBorrowService ...@@ -199,38 +199,9 @@ public class LicenceApplyBorrowServiceImpl implements LicenceApplyBorrowService
licenceApplyBorrowDao.updateLicenceBorrowMation(map); licenceApplyBorrowDao.updateLicenceBorrowMation(map);
licenceApplyBorrowDao.deleteLicenceBorrowGoodsMationById(map); licenceApplyBorrowDao.deleteLicenceBorrowGoodsMationById(map);
licenceApplyBorrowDao.insertLicenceBorrowGoodsMation(entitys); licenceApplyBorrowDao.insertLicenceBorrowGoodsMation(entitys);
// 判断是否提交审批 // 操作工作流数据
if("2".equals(subType)){ activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
// 提交审批 ACTIVITI_LICENCE_USE_PAGE_KEY, useId, map.get("approvalId").toString());
ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_LICENCE_USE_PAGE_KEY).submitToActivi(useId, ActivitiConstants.APPROVAL_ID);
}
}
/**
*
* @Title: updateBorrowLicenceMationToSave
* @Description: 编辑证照借用申请（已提交审批）
* @param inputObject
* @param outputObject
* @throws Exception 参数
* @return void 返回类型
* @throws
*/
@Override
@Transactional(value="transactionManager")
public void updateBorrowLicenceMationToSave(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams();
String useId = map.get("id").toString();//借用单主表id
List<Map<String, Object>> entitys = getLicenceList(map.get("licenceStr").toString(), useId, "1");
if(entitys.size() == 0){
outputObject.setreturnMessage("请选择证照");
return;
}
licenceApplyBorrowDao.updateLicenceBorrowMation(map);
licenceApplyBorrowDao.deleteLicenceBorrowGoodsMationById(map);
licenceApplyBorrowDao.insertLicenceBorrowGoodsMation(entitys);
// 更新工作流数据
ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_LICENCE_USE_PAGE_KEY).editApplyMationInActiviti(useId);
} }
/** /**
...@@ -244,7 +215,7 @@ public class LicenceApplyBorrowServiceImpl implements LicenceApplyBorrowService ...@@ -244,7 +215,7 @@ public class LicenceApplyBorrowServiceImpl implements LicenceApplyBorrowService
* @throws * @throws
*/ */
@Override @Override
@Transactional(value="transactionManager") @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void editBorrowLicenceToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception { public void editBorrowLicenceToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
String id = map.get("id").toString(); String id = map.get("id").toString();
...@@ -255,7 +226,8 @@ public class LicenceApplyBorrowServiceImpl implements LicenceApplyBorrowService ...@@ -255,7 +226,8 @@ public class LicenceApplyBorrowServiceImpl implements LicenceApplyBorrowService
|| ActivitiConstants.ActivitiState.NO_PASS.getState() == state || ActivitiConstants.ActivitiState.NO_PASS.getState() == state
|| ActivitiConstants.ActivitiState.REVOKE.getState() == state){ || ActivitiConstants.ActivitiState.REVOKE.getState() == state){
// 草稿、审核不通过或者撤销状态下可以提交审批 // 草稿、审核不通过或者撤销状态下可以提交审批
ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_LICENCE_USE_PAGE_KEY).submitToActivi(id, ActivitiConstants.APPROVAL_ID); activitiUserService.addOrEditToSubmit(inputObject, outputObject, 2,
ACTIVITI_LICENCE_USE_PAGE_KEY, id, map.get("approvalId").toString());
}else{ }else{
outputObject.setreturnMessage("该数据状态已改变，请刷新页面！"); outputObject.setreturnMessage("该数据状态已改变，请刷新页面！");
} }
...@@ -300,6 +272,7 @@ public class LicenceApplyBorrowServiceImpl implements LicenceApplyBorrowService ...@@ -300,6 +272,7 @@ public class LicenceApplyBorrowServiceImpl implements LicenceApplyBorrowService
* @throws * @throws
*/ */
@Override @Override
@ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void updateBorrowLicenceMationToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception { public void updateBorrowLicenceMationToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception {
ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_LICENCE_USE_PAGE_KEY).revokeActivi(); ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_LICENCE_USE_PAGE_KEY).revokeActivi();
} }
......
skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/LicenceApplyRevertServiceImpl.java
浏览文件 @ 7b84eeb8
...@@ -6,6 +6,8 @@ package com.skyeye.eve.service.impl; ...@@ -6,6 +6,8 @@ package com.skyeye.eve.service.impl;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.skyeye.activiti.factory.ActivitiRunFactory; import com.skyeye.activiti.factory.ActivitiRunFactory;
import com.skyeye.activiti.service.ActivitiUserService;
import com.skyeye.annotation.transaction.ActivitiAndBaseTransaction;
import com.skyeye.common.constans.ActivitiConstants; import com.skyeye.common.constans.ActivitiConstants;
import com.skyeye.common.constans.AdminAssistantConstants; import com.skyeye.common.constans.AdminAssistantConstants;
import com.skyeye.common.object.InputObject; import com.skyeye.common.object.InputObject;
...@@ -44,6 +46,9 @@ public class LicenceApplyRevertServiceImpl implements LicenceApplyRevertService ...@@ -44,6 +46,9 @@ public class LicenceApplyRevertServiceImpl implements LicenceApplyRevertService
@Autowired @Autowired
private SysEnclosureDao sysEnclosureDao; private SysEnclosureDao sysEnclosureDao;
@Autowired
private ActivitiUserService activitiUserService;
/** /**
* 证照归还关联的工作流的key * 证照归还关联的工作流的key
*/ */
...@@ -75,7 +80,7 @@ public class LicenceApplyRevertServiceImpl implements LicenceApplyRevertService ...@@ -75,7 +80,7 @@ public class LicenceApplyRevertServiceImpl implements LicenceApplyRevertService
* @throws * @throws
*/ */
@Override @Override
@Transactional(value="transactionManager") @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void insertRevertLicenceMation(InputObject inputObject, OutputObject outputObject) throws Exception { public void insertRevertLicenceMation(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
String revertId = ToolUtil.getSurFaceId();//归还单主表id String revertId = ToolUtil.getSurFaceId();//归还单主表id
...@@ -94,11 +99,9 @@ public class LicenceApplyRevertServiceImpl implements LicenceApplyRevertService ...@@ -94,11 +99,9 @@ public class LicenceApplyRevertServiceImpl implements LicenceApplyRevertService
map.put("createTime", DateUtil.getTimeAndToString()); map.put("createTime", DateUtil.getTimeAndToString());
licenceApplyRevertDao.insertLicenceRevertMation(map); licenceApplyRevertDao.insertLicenceRevertMation(map);
licenceApplyRevertDao.insertLicenceRevertGoodsMation(entitys); licenceApplyRevertDao.insertLicenceRevertGoodsMation(entitys);
// 判断是否提交审批 // 操作工作流数据
if("2".equals(subType)){ activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
// 提交审批 ACTIVITI_LICENCE_REVERT_PAGE_KEY, revertId, map.get("approvalId").toString());
ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_LICENCE_REVERT_PAGE_KEY).submitToActivi(revertId, ActivitiConstants.APPROVAL_ID);
}
} }
/** /**
...@@ -162,7 +165,7 @@ public class LicenceApplyRevertServiceImpl implements LicenceApplyRevertService ...@@ -162,7 +165,7 @@ public class LicenceApplyRevertServiceImpl implements LicenceApplyRevertService
* @throws * @throws
*/ */
@Override @Override
@Transactional(value="transactionManager") @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void updateRevertLicenceMationById(InputObject inputObject, OutputObject outputObject) throws Exception { public void updateRevertLicenceMationById(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
String revertId = map.get("id").toString();//归还单主表id String revertId = map.get("id").toString();//归还单主表id
...@@ -176,11 +179,9 @@ public class LicenceApplyRevertServiceImpl implements LicenceApplyRevertService ...@@ -176,11 +179,9 @@ public class LicenceApplyRevertServiceImpl implements LicenceApplyRevertService
licenceApplyRevertDao.updateLicenceRevertMation(map); licenceApplyRevertDao.updateLicenceRevertMation(map);
licenceApplyRevertDao.deleteLicenceRevertGoodsMationById(map); licenceApplyRevertDao.deleteLicenceRevertGoodsMationById(map);
licenceApplyRevertDao.insertLicenceRevertGoodsMation(entitys); licenceApplyRevertDao.insertLicenceRevertGoodsMation(entitys);
// 判断是否提交审批 // 操作工作流数据
if("2".equals(subType)){ activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
// 提交审批 ACTIVITI_LICENCE_REVERT_PAGE_KEY, revertId, map.get("approvalId").toString());
ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_LICENCE_REVERT_PAGE_KEY).submitToActivi(revertId, ActivitiConstants.APPROVAL_ID);
}
} }
/** /**
...@@ -210,32 +211,6 @@ public class LicenceApplyRevertServiceImpl implements LicenceApplyRevertService ...@@ -210,32 +211,6 @@ public class LicenceApplyRevertServiceImpl implements LicenceApplyRevertService
return entitys; return entitys;
} }
/**
*
* @Title: updateRevertLicenceMationToSave
* @Description: 编辑证照归还申请（已提交审批）
* @param inputObject
* @param outputObject
* @throws Exception 参数
* @return void 返回类型
* @throws
*/
@Override
@Transactional(value="transactionManager")
public void updateRevertLicenceMationToSave(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams();
String revertId = map.get("id").toString();//归还单主表id
List<Map<String, Object>> entitys = getLicenceListByParams(map.get("licenceStr").toString(), revertId, "1");
if(entitys.size() == 0){
outputObject.setreturnMessage("请选择证照");
return;
}
licenceApplyRevertDao.updateLicenceRevertMation(map);
licenceApplyRevertDao.deleteLicenceRevertGoodsMationById(map);
licenceApplyRevertDao.insertLicenceRevertGoodsMation(entitys);
ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_LICENCE_REVERT_PAGE_KEY).editApplyMationInActiviti(revertId);
}
/** /**
* *
* @Title: editRevertLicenceToSubApproval * @Title: editRevertLicenceToSubApproval
...@@ -247,7 +222,7 @@ public class LicenceApplyRevertServiceImpl implements LicenceApplyRevertService ...@@ -247,7 +222,7 @@ public class LicenceApplyRevertServiceImpl implements LicenceApplyRevertService
* @throws * @throws
*/ */
@Override @Override
@Transactional(value="transactionManager") @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void editRevertLicenceToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception { public void editRevertLicenceToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
String id = map.get("id").toString(); String id = map.get("id").toString();
...@@ -258,7 +233,9 @@ public class LicenceApplyRevertServiceImpl implements LicenceApplyRevertService ...@@ -258,7 +233,9 @@ public class LicenceApplyRevertServiceImpl implements LicenceApplyRevertService
|| ActivitiConstants.ActivitiState.NO_PASS.getState() == state || ActivitiConstants.ActivitiState.NO_PASS.getState() == state
|| ActivitiConstants.ActivitiState.REVOKE.getState() == state){ || ActivitiConstants.ActivitiState.REVOKE.getState() == state){
// 草稿、审核不通过或者撤销状态下可以提交审批 // 草稿、审核不通过或者撤销状态下可以提交审批
ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_LICENCE_REVERT_PAGE_KEY).submitToActivi(id, ActivitiConstants.APPROVAL_ID); // 操作工作流数据
activitiUserService.addOrEditToSubmit(inputObject, outputObject, 2,
ACTIVITI_LICENCE_REVERT_PAGE_KEY, id, map.get("approvalId").toString());
}else{ }else{
outputObject.setreturnMessage("该数据状态已改变，请刷新页面！"); outputObject.setreturnMessage("该数据状态已改变，请刷新页面！");
} }
...@@ -302,7 +279,7 @@ public class LicenceApplyRevertServiceImpl implements LicenceApplyRevertService ...@@ -302,7 +279,7 @@ public class LicenceApplyRevertServiceImpl implements LicenceApplyRevertService
* @return void 返回类型 * @return void 返回类型
* @throws * @throws
*/ */
@Override @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void updateRevertLicenceMationToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception { public void updateRevertLicenceMationToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception {
ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_LICENCE_REVERT_PAGE_KEY).revokeActivi(); ActivitiRunFactory.run(inputObject, outputObject, ACTIVITI_LICENCE_REVERT_PAGE_KEY).revokeActivi();
} }
......
skyeye-admin-assistant/src/main/resources/reqmapping/mapping/assistant.xml
浏览文件 @ 7b84eeb8
...@@ -822,6 +822,7 @@ ...@@ -822,6 +822,7 @@
<property id="licenceStr" name="licenceStr" ref="required,json" var="关联的证照json串" /> <property id="licenceStr" name="licenceStr" ref="required,json" var="关联的证照json串" />
<property id="enclosureInfo" name="enclosureInfo" ref="" var="附件" /> <property id="enclosureInfo" name="enclosureInfo" ref="" var="附件" />
<property id="subType" name="subType" ref="required,num" var="表单提交类型" /> <property id="subType" name="subType" ref="required,num" var="表单提交类型" />
<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
</url> </url>
<url id="licenceborrow003" path="/post/LicenceApplyBorrowController/queryBorrowLicenceMationToDetails" val="证照借用申请详情" allUse="2" groupName="证照借用管理"> <url id="licenceborrow003" path="/post/LicenceApplyBorrowController/queryBorrowLicenceMationToDetails" val="证照借用申请详情" allUse="2" groupName="证照借用管理">
<property id="rowId" name="id" ref="required" var="证照借用主表单id" /> <property id="rowId" name="id" ref="required" var="证照借用主表单id" />
...@@ -835,19 +836,15 @@ ...@@ -835,19 +836,15 @@
<property id="enclosureInfo" name="enclosureInfo" ref="" var="附件" /> <property id="enclosureInfo" name="enclosureInfo" ref="" var="附件" />
<property id="rowId" name="id" ref="required" var="证照借用主表单id" /> <property id="rowId" name="id" ref="required" var="证照借用主表单id" />
<property id="subType" name="subType" ref="required,num" var="表单提交类型" /> <property id="subType" name="subType" ref="required,num" var="表单提交类型" />
<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
</url> </url>
<url id="licenceborrow006" path="/post/LicenceApplyBorrowController/editBorrowLicenceToSubApproval" val="证照借用申请提交审批" allUse="1" groupName="证照借用管理"> <url id="licenceborrow006" path="/post/LicenceApplyBorrowController/editBorrowLicenceToSubApproval" val="证照借用申请提交审批" allUse="1" groupName="证照借用管理">
<property id="rowId" name="id" ref="required" var="证照借用主表单id" /> <property id="rowId" name="id" ref="required" var="证照借用主表单id" />
<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
</url> </url>
<url id="licenceborrow007" path="/post/LicenceApplyBorrowController/updateBorrowLicenceToCancellation" val="作废证照借用申请" allUse="1" groupName="证照借用管理"> <url id="licenceborrow007" path="/post/LicenceApplyBorrowController/updateBorrowLicenceToCancellation" val="作废证照借用申请" allUse="1" groupName="证照借用管理">
<property id="rowId" name="id" ref="required" var="证照借用主表单id" /> <property id="rowId" name="id" ref="required" var="证照借用主表单id" />
</url> </url>
<url id="licenceborrow009" path="/post/LicenceApplyBorrowController/updateBorrowLicenceMationToSave" val="编辑证照借用申请（已提交审批）" allUse="2" groupName="证照借用管理">
<property id="remark" name="remark" ref="" var="描述" />
<property id="licenceStr" name="licenceStr" ref="required,json" var="关联的证照json串" />
<property id="enclosureInfo" name="enclosureInfo" ref="" var="附件" />
<property id="rowId" name="id" ref="required" var="证照借用主表单id" />
</url>
<url id="licenceborrow010" path="/post/LicenceApplyBorrowController/updateBorrowLicenceMationToRevoke" val="撤销证照借用申请" allUse="1" groupName="证照借用管理"> <url id="licenceborrow010" path="/post/LicenceApplyBorrowController/updateBorrowLicenceMationToRevoke" val="撤销证照借用申请" allUse="1" groupName="证照借用管理">
<property id="processInstanceId" name="processInstanceId" ref="required" var="流程id" /> <property id="processInstanceId" name="processInstanceId" ref="required" var="流程id" />
</url> </url>
...@@ -867,6 +864,7 @@ ...@@ -867,6 +864,7 @@
<property id="licenceStr" name="licenceStr" ref="required,json" var="证照json串" /> <property id="licenceStr" name="licenceStr" ref="required,json" var="证照json串" />
<property id="enclosureInfo" name="enclosureInfo" ref="" var="附件" /> <property id="enclosureInfo" name="enclosureInfo" ref="" var="附件" />
<property id="subType" name="subType" ref="required,num" var="表单提交类型" /> <property id="subType" name="subType" ref="required,num" var="表单提交类型" />
<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
</url> </url>
<url id="licencerevert003" path="/post/LicenceApplyRevertController/queryRevertLicenceMationToDetails" val="证照归还申请详情" allUse="2" groupName="证照归还管理"> <url id="licencerevert003" path="/post/LicenceApplyRevertController/queryRevertLicenceMationToDetails" val="证照归还申请详情" allUse="2" groupName="证照归还管理">
<property id="rowId" name="id" ref="required" var="证照归还主表单id" /> <property id="rowId" name="id" ref="required" var="证照归还主表单id" />
...@@ -880,19 +878,15 @@ ...@@ -880,19 +878,15 @@
<property id="enclosureInfo" name="enclosureInfo" ref="" var="附件" /> <property id="enclosureInfo" name="enclosureInfo" ref="" var="附件" />
<property id="rowId" name="id" ref="required" var="证照归还主表单id" /> <property id="rowId" name="id" ref="required" var="证照归还主表单id" />
<property id="subType" name="subType" ref="required,num" var="表单提交类型" /> <property id="subType" name="subType" ref="required,num" var="表单提交类型" />
<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
</url> </url>
<url id="licencerevert006" path="/post/LicenceApplyRevertController/editRevertLicenceToSubApproval" val="证照归还申请提交审批" allUse="1" groupName="证照归还管理"> <url id="licencerevert006" path="/post/LicenceApplyRevertController/editRevertLicenceToSubApproval" val="证照归还申请提交审批" allUse="1" groupName="证照归还管理">
<property id="rowId" name="id" ref="required" var="证照归还主表单id" /> <property id="rowId" name="id" ref="required" var="证照归还主表单id" />
<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
</url> </url>
<url id="licencerevert007" path="/post/LicenceApplyRevertController/updateRevertLicenceToCancellation" val="作废证照归还申请" allUse="1" groupName="证照归还管理"> <url id="licencerevert007" path="/post/LicenceApplyRevertController/updateRevertLicenceToCancellation" val="作废证照归还申请" allUse="1" groupName="证照归还管理">
<property id="rowId" name="id" ref="required" var="证照归还主表单id" /> <property id="rowId" name="id" ref="required" var="证照归还主表单id" />
</url> </url>
<url id="licencerevert009" path="/post/LicenceApplyRevertController/updateRevertLicenceMationToSave" val="编辑证照归还申请（已提交审批）" allUse="2" groupName="证照归还管理">
<property id="remark" name="remark" ref="" var="描述" />
<property id="licenceStr" name="licenceStr" ref="required,json" var="证照json串" />
<property id="enclosureInfo" name="enclosureInfo" ref="" var="附件" />
<property id="rowId" name="id" ref="required" var="证照归还主表单id" />
</url>
<url id="licencerevert010" path="/post/LicenceApplyRevertController/updateRevertLicenceMationToRevoke" val="撤销证照归还申请" allUse="1" groupName="证照归还管理"> <url id="licencerevert010" path="/post/LicenceApplyRevertController/updateRevertLicenceMationToRevoke" val="撤销证照归还申请" allUse="1" groupName="证照归还管理">
<property id="processInstanceId" name="processInstanceId" ref="required" var="流程id" /> <property id="processInstanceId" name="processInstanceId" ref="required" var="流程id" />
</url> </url>
......
skyeye-crm/src/main/java/com/skyeye/controller/CrmOpportunityController.java
浏览文件 @ 7b84eeb8
...@@ -240,22 +240,6 @@ public class CrmOpportunityController { ...@@ -240,22 +240,6 @@ public class CrmOpportunityController {
crmOpportunityService.editOpportunityToApprovalById(inputObject, outputObject); crmOpportunityService.editOpportunityToApprovalById(inputObject, outputObject);
} }
/**
*
* @Title: editOpportunityMationByIdInProcess
* @Description: 在工作流中全部商机编辑商机信息
* @param inputObject
* @param outputObject
* @throws Exception 参数
* @return void 返回类型
* @throws
*/
@RequestMapping("/post/CrmOpportunityController/editOpportunityMationByIdInProcess")
@ResponseBody
public void editOpportunityMationByIdInProcess(InputObject inputObject, OutputObject outputObject) throws Exception {
crmOpportunityService.editOpportunityMationByIdInProcess(inputObject, outputObject);
}
/** /**
* *
* @Title: editOpportunityToConmunicate * @Title: editOpportunityToConmunicate
......
skyeye-crm/src/main/java/com/skyeye/service/CrmOpportunityService.java
浏览文件 @ 7b84eeb8
...@@ -36,8 +36,6 @@ public interface CrmOpportunityService { ...@@ -36,8 +36,6 @@ public interface CrmOpportunityService {
public void editOpportunityToApprovalById(InputObject inputObject, OutputObject outputObject) throws Exception; public void editOpportunityToApprovalById(InputObject inputObject, OutputObject outputObject) throws Exception;
public void editOpportunityMationByIdInProcess(InputObject inputObject, OutputObject outputObject) throws Exception;
public void editOpportunityToConmunicate(InputObject inputObject, OutputObject outputObject) throws Exception; public void editOpportunityToConmunicate(InputObject inputObject, OutputObject outputObject) throws Exception;
public void editOpportunityToQuotedPrice(InputObject inputObject, OutputObject outputObject) throws Exception; public void editOpportunityToQuotedPrice(InputObject inputObject, OutputObject outputObject) throws Exception;
......
skyeye-crm/src/main/java/com/skyeye/service/impl/CrmOpportunityServiceImpl.java
浏览文件 @ 7b84eeb8
...@@ -7,6 +7,8 @@ package com.skyeye.service.impl; ...@@ -7,6 +7,8 @@ package com.skyeye.service.impl;
import com.github.pagehelper.Page; import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.skyeye.activiti.factory.ActivitiRunFactory; import com.skyeye.activiti.factory.ActivitiRunFactory;
import com.skyeye.activiti.service.ActivitiUserService;
import com.skyeye.annotation.transaction.ActivitiAndBaseTransaction;
import com.skyeye.common.constans.ActivitiConstants; import com.skyeye.common.constans.ActivitiConstants;
import com.skyeye.common.object.InputObject; import com.skyeye.common.object.InputObject;
import com.skyeye.common.object.OutputObject; import com.skyeye.common.object.OutputObject;
...@@ -50,6 +52,9 @@ public class CrmOpportunityServiceImpl implements CrmOpportunityService { ...@@ -50,6 +52,9 @@ public class CrmOpportunityServiceImpl implements CrmOpportunityService {
@Autowired @Autowired
private SysEnclosureDao sysEnclosureDao; private SysEnclosureDao sysEnclosureDao;
@Autowired
private ActivitiUserService activitiUserService;
/** /**
* 客户商机申请到工作流中的key * 客户商机申请到工作流中的key
*/ */
...@@ -93,7 +98,7 @@ public class CrmOpportunityServiceImpl implements CrmOpportunityService { ...@@ -93,7 +98,7 @@ public class CrmOpportunityServiceImpl implements CrmOpportunityService {
* @throws * @throws
*/ */
@Override @Override
@Transactional(value = "transactionManager") @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void insertCrmOpportunityMation(InputObject inputObject, OutputObject outputObject) throws Exception { public void insertCrmOpportunityMation(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
Map<String, Object> bean = crmOpportunityDao.queryOpportunityMationByName(map); Map<String, Object> bean = crmOpportunityDao.queryOpportunityMationByName(map);
...@@ -108,11 +113,9 @@ public class CrmOpportunityServiceImpl implements CrmOpportunityService { ...@@ -108,11 +113,9 @@ public class CrmOpportunityServiceImpl implements CrmOpportunityService {
map.put("createName", user.get("userName")); map.put("createName", user.get("userName"));
map.put("createTime", DateUtil.getTimeAndToString()); map.put("createTime", DateUtil.getTimeAndToString());
crmOpportunityDao.insertCrmOpportunityMation(map); crmOpportunityDao.insertCrmOpportunityMation(map);
// 判断是否提交审批 // 操作工作流数据
if("2".equals(map.get("subType").toString())){ activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
// 提交审批 CRM_OPPORTUNITY_PAGE_KEY, id, map.get("approvalId").toString());
ActivitiRunFactory.run(inputObject, outputObject, CRM_OPPORTUNITY_PAGE_KEY).submitToActivi(id, ActivitiConstants.APPROVAL_ID);
}
} }
} }
...@@ -188,7 +191,7 @@ public class CrmOpportunityServiceImpl implements CrmOpportunityService { ...@@ -188,7 +191,7 @@ public class CrmOpportunityServiceImpl implements CrmOpportunityService {
* @throws * @throws
*/ */
@Override @Override
@Transactional(value = "transactionManager") @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void editOpportunityMationById(InputObject inputObject, OutputObject outputObject) throws Exception { public void editOpportunityMationById(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
Map<String, Object> bean = crmOpportunityDao.queryOpportunityMationByName(map); Map<String, Object> bean = crmOpportunityDao.queryOpportunityMationByName(map);
...@@ -196,11 +199,9 @@ public class CrmOpportunityServiceImpl implements CrmOpportunityService { ...@@ -196,11 +199,9 @@ public class CrmOpportunityServiceImpl implements CrmOpportunityService {
judgeParams(map); judgeParams(map);
String id = map.get("id").toString(); String id = map.get("id").toString();
crmOpportunityDao.editOpportunityMationById(map); crmOpportunityDao.editOpportunityMationById(map);
// 判断是否提交审批 // 操作工作流数据
if("2".equals(map.get("subType").toString())){ activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
// 提交审批 CRM_OPPORTUNITY_PAGE_KEY, id, map.get("approvalId").toString());
ActivitiRunFactory.run(inputObject, outputObject, CRM_OPPORTUNITY_PAGE_KEY).submitToActivi(id, ActivitiConstants.APPROVAL_ID);
}
}else{ }else{
outputObject.setreturnMessage("该商机名称已存在，不可进行二次保存"); outputObject.setreturnMessage("该商机名称已存在，不可进行二次保存");
} }
...@@ -401,45 +402,21 @@ public class CrmOpportunityServiceImpl implements CrmOpportunityService { ...@@ -401,45 +402,21 @@ public class CrmOpportunityServiceImpl implements CrmOpportunityService {
* @throws * @throws
*/ */
@Override @Override
@Transactional(value = "transactionManager") @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void editOpportunityToApprovalById(InputObject inputObject, OutputObject outputObject) throws Exception { public void editOpportunityToApprovalById(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
String opportunityId = map.get("id").toString(); String opportunityId = map.get("id").toString();
Map<String, Object> bean = crmOpportunityDao.queryCrmOpportunityStateById(opportunityId);//查询商机的状态 Map<String, Object> bean = crmOpportunityDao.queryCrmOpportunityStateById(opportunityId);//查询商机的状态
if("0".equals(bean.get("state").toString()) || "12".equals(bean.get("state").toString())){ Integer state = Integer.parseInt(bean.get("state").toString());
if(0 == state || 12 == state){
// 草稿、审核不通过状态下可以提交审批 // 草稿、审核不通过状态下可以提交审批
ActivitiRunFactory.run(inputObject, outputObject, CRM_OPPORTUNITY_PAGE_KEY).submitToActivi(opportunityId, ActivitiConstants.APPROVAL_ID); activitiUserService.addOrEditToSubmit(inputObject, outputObject, 2,
CRM_OPPORTUNITY_PAGE_KEY, opportunityId, map.get("approvalId").toString());
}else{ }else{
outputObject.setreturnMessage("该数据状态已改变，请刷新页面！"); outputObject.setreturnMessage("该数据状态已改变，请刷新页面！");
} }
} }
/**
*
* @Title: editOpportunityMationByIdInProcess
* @Description: 在工作流中全部商机编辑商机信息
* @param inputObject
* @param outputObject
* @throws Exception 参数
* @return void 返回类型
* @throws
*/
@Override
@Transactional(value = "transactionManager")
public void editOpportunityMationByIdInProcess(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams();
Map<String, Object> bean = crmOpportunityDao.queryOpportunityMationByName(map);
if(bean == null){
judgeParams(map);
String id = map.get("id").toString();
crmOpportunityDao.editOpportunityMationById(map);
// 编辑流程表参数
ActivitiRunFactory.run(inputObject, outputObject, CRM_OPPORTUNITY_PAGE_KEY).editApplyMationInActiviti(id);
}else{
outputObject.setreturnMessage("该商机名称已存在，不可进行二次保存");
}
}
/** /**
* @throws Exception * @throws Exception
* *
...@@ -675,7 +652,7 @@ public class CrmOpportunityServiceImpl implements CrmOpportunityService { ...@@ -675,7 +652,7 @@ public class CrmOpportunityServiceImpl implements CrmOpportunityService {
* @throws * @throws
*/ */
@Override @Override
@Transactional(value = "transactionManager") @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void editOpportunityProcessToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception { public void editOpportunityProcessToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception {
ActivitiRunFactory.run(inputObject, outputObject, CRM_OPPORTUNITY_PAGE_KEY).revokeActivi(); ActivitiRunFactory.run(inputObject, outputObject, CRM_OPPORTUNITY_PAGE_KEY).revokeActivi();
} }
......
skyeye-crm/src/main/resources/reqmapping/mapping/crm.xml
浏览文件 @ 7b84eeb8
...@@ -91,6 +91,7 @@ ...@@ -91,6 +91,7 @@
<property id="partId" name="partId" ref="" var="商机参与人"/> <property id="partId" name="partId" ref="" var="商机参与人"/>
<property id="followId" name="followId" ref="" var="商机关注人"/> <property id="followId" name="followId" ref="" var="商机关注人"/>
<property id="subType" name="subType" ref="required,num" var="表单提交类型"/> <property id="subType" name="subType" ref="required,num" var="表单提交类型"/>
<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
</url> </url>
<url id="opportunity012" path="/post/CrmOpportunityController/editOpportunityMationById" val="编辑商机信息" allUse="1" groupName="商机模块"> <url id="opportunity012" path="/post/CrmOpportunityController/editOpportunityMationById" val="编辑商机信息" allUse="1" groupName="商机模块">
<property id="rowId" name="id" ref="required" var="商机id"/> <property id="rowId" name="id" ref="required" var="商机id"/>
...@@ -115,6 +116,7 @@ ...@@ -115,6 +116,7 @@
<property id="partId" name="partId" ref="" var="商机参与人"/> <property id="partId" name="partId" ref="" var="商机参与人"/>
<property id="followId" name="followId" ref="" var="商机关注人"/> <property id="followId" name="followId" ref="" var="商机关注人"/>
<property id="subType" name="subType" ref="required,num" var="表单提交类型"/> <property id="subType" name="subType" ref="required,num" var="表单提交类型"/>
<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
</url> </url>
<url id="opportunity013" path="/post/CrmOpportunityController/deleteOpportunityMationById" val="商机根据id删除商机信息" allUse="1" groupName="商机模块"> <url id="opportunity013" path="/post/CrmOpportunityController/deleteOpportunityMationById" val="商机根据id删除商机信息" allUse="1" groupName="商机模块">
<property id="rowId" name="id" ref="required" var="商机id"/> <property id="rowId" name="id" ref="required" var="商机id"/>
...@@ -132,6 +134,7 @@ ...@@ -132,6 +134,7 @@
</url> </url>
<url id="opportunity017" path="/post/CrmOpportunityController/editOpportunityToApprovalById" val="根据商机Id提交审批" allUse="1" groupName="商机模块"> <url id="opportunity017" path="/post/CrmOpportunityController/editOpportunityToApprovalById" val="根据商机Id提交审批" allUse="1" groupName="商机模块">
<property id="rowId" name="id" ref="required" var="商机id"/> <property id="rowId" name="id" ref="required" var="商机id"/>
<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
</url> </url>
<url id="opportunity018" path="/post/CrmOpportunityController/queryAllDiscussList" val="获取所有讨论板" allUse="1" groupName="商机模块"> <url id="opportunity018" path="/post/CrmOpportunityController/queryAllDiscussList" val="获取所有讨论板" allUse="1" groupName="商机模块">
<property id="limit" name="limit" ref="required,num" var="分页参数,每页多少条数据" /> <property id="limit" name="limit" ref="required,num" var="分页参数,每页多少条数据" />
...@@ -160,29 +163,6 @@ ...@@ -160,29 +163,6 @@
<url id="opportunity025" path="/post/CrmOpportunityController/editOpportunityToLayAside" val="根据商机Id搁置" allUse="1" groupName="商机模块"> <url id="opportunity025" path="/post/CrmOpportunityController/editOpportunityToLayAside" val="根据商机Id搁置" allUse="1" groupName="商机模块">
<property id="rowId" name="id" ref="required" var="商机id"/> <property id="rowId" name="id" ref="required" var="商机id"/>
</url> </url>
<url id="opportunity026" path="/post/CrmOpportunityController/editOpportunityMationByIdInProcess" val="在工作流中全部商机编辑商机信息" allUse="2" groupName="商机模块">
<property id="rowId" name="id" ref="required" var="商机id"/>
<property id="customerId" name="customerId" ref="required" var="客户名称"/>
<property id="city" name="city" ref="" var="所在城市"/>
<property id="detailAddress" name="detailAddress" ref="" var="详细地址"/>
<property id="title" name="title" ref="required" var="商机名称"/>
<property id="fromId" name="fromId" ref="required" var="商机来源"/>
<property id="estimatePrice" name="estimatePrice" ref="" var="预计成交金额"/>
<property id="estimateEndTime" name="estimateEndTime" ref="" var="预计结单日期"/>
<property id="contacts" name="contacts" ref="required" var="联系人"/>
<property id="department" name="department" ref="" var="部门"/>
<property id="job" name="job" ref="" var="职位"/>
<property id="workPhone" name="workPhone" ref="" var="办公电话"/>
<property id="mobilePhone" name="mobilePhone" ref="phone" var="移动电话"/>
<property id="email" name="email" ref="email" var="邮箱"/>
<property id="qq" name="qq" ref="" var="QQ号"/>
<property id="businessNeed" name="businessNeed" ref="" var="主要业务需求"/>
<property id="enclosureInfo" name="enclosureInfo" ref="" var="附件"/>
<property id="subDepartments" name="subDepartments" ref="required" var="商机所属部门"/>
<property id="responsId" name="responsId" ref="required" var="商机负责人"/>
<property id="partId" name="partId" ref="" var="商机参与人"/>
<property id="followId" name="followId" ref="" var="商机关注人"/>
</url>
<url id="opportunity027" path="/post/CrmOpportunityController/editOpportunityProcessToRevoke" val="撤销商机审批申请" allUse="1" groupName="商机模块"> <url id="opportunity027" path="/post/CrmOpportunityController/editOpportunityProcessToRevoke" val="撤销商机审批申请" allUse="1" groupName="商机模块">
<property id="processInstanceId" name="processInstanceId" ref="required" var="流程id"/> <property id="processInstanceId" name="processInstanceId" ref="required" var="流程id"/>
</url> </url>
......
skyeye-pro/src/main/java/com/skyeye/controller/ProCostExpenseController.java
浏览文件 @ 7b84eeb8
...@@ -141,22 +141,6 @@ public class ProCostExpenseController { ...@@ -141,22 +141,6 @@ public class ProCostExpenseController {
proCostExpenseService.editProCostExpenseProcessToRevoke(inputObject, outputObject); proCostExpenseService.editProCostExpenseProcessToRevoke(inputObject, outputObject);
} }
/**
*
* @Title: editProCostExpenseMationInProcess
* @Description: 在工作流中编辑费用报销信息
* @param inputObject
* @param outputObject
* @throws Exception 参数
* @return void 返回类型
* @throws
*/
@RequestMapping("/post/ProCostExpenseController/editProCostExpenseMationInProcess")
@ResponseBody
public void editProCostExpenseMationInProcess(InputObject inputObject, OutputObject outputObject) throws Exception {
proCostExpenseService.editProCostExpenseMationInProcess(inputObject, outputObject);
}
/** /**
* *
* @Title: deleteProCostExpenseMationById * @Title: deleteProCostExpenseMationById
......
skyeye-pro/src/main/java/com/skyeye/controller/ProFileController.java
浏览文件 @ 7b84eeb8
...@@ -141,22 +141,6 @@ public class ProFileController { ...@@ -141,22 +141,6 @@ public class ProFileController {
proFileService.editProFileProcessToRevoke(inputObject, outputObject); proFileService.editProFileProcessToRevoke(inputObject, outputObject);
} }
/**
*
* @Title: editProFileMationInProcess
* @Description: 在工作流中编辑文档信息
* @param inputObject
* @param outputObject
* @throws Exception 参数
* @return void 返回类型
* @throws
*/
@RequestMapping("/post/ProFileController/editProFileMationInProcess")
@ResponseBody
public void editProFileMationInProcess(InputObject inputObject, OutputObject outputObject) throws Exception {
proFileService.editProFileMationInProcess(inputObject, outputObject);
}
/** /**
* *
* @Title: deleteProFileMationById * @Title: deleteProFileMationById
......
skyeye-pro/src/main/java/com/skyeye/controller/ProProjectController.java
浏览文件 @ 7b84eeb8
...@@ -275,20 +275,4 @@ public class ProProjectController { ...@@ -275,20 +275,4 @@ public class ProProjectController {
proProjectService.editProjectProcessToPerFectById(inputObject, outputObject); proProjectService.editProjectProcessToPerFectById(inputObject, outputObject);
} }
/**
*
* @Title: editProjectMationInProcess
* @Description: 在工作流中编辑项目信息
* @param inputObject
* @param outputObject
* @throws Exception 参数
* @return void 返回类型
* @throws
*/
@RequestMapping("/post/ProProjectController/editProjectMationInProcess")
@ResponseBody
public void editProjectMationInProcess(InputObject inputObject, OutputObject outputObject) throws Exception {
proProjectService.editProjectMationInProcess(inputObject, outputObject);
}
} }
skyeye-pro/src/main/java/com/skyeye/controller/ProTaskController.java
浏览文件 @ 7b84eeb8
...@@ -172,23 +172,7 @@ public class ProTaskController { ...@@ -172,23 +172,7 @@ public class ProTaskController {
public void updateProTaskToCancellation(InputObject inputObject, OutputObject outputObject) throws Exception { public void updateProTaskToCancellation(InputObject inputObject, OutputObject outputObject) throws Exception {
proTaskService.updateProTaskToCancellation(inputObject, outputObject); proTaskService.updateProTaskToCancellation(inputObject, outputObject);
} }
/**
*
* @Title: editProTaskMationInProcess
* @Description: 在工作流中编辑任务信息
* @param inputObject
* @param outputObject
* @throws Exception 参数
* @return void 返回类型
* @throws
*/
@RequestMapping("/post/ProTaskController/editProTaskMationInProcess")
@ResponseBody
public void editProTaskMationInProcess(InputObject inputObject, OutputObject outputObject) throws Exception {
proTaskService.editProTaskMationInProcess(inputObject, outputObject);
}
/** /**
* *
* @Title: queryMyProTaskList * @Title: queryMyProTaskList
......
skyeye-pro/src/main/java/com/skyeye/controller/ProWorkloadController.java
浏览文件 @ 7b84eeb8
...@@ -148,22 +148,6 @@ public class ProWorkloadController { ...@@ -148,22 +148,6 @@ public class ProWorkloadController {
/** /**
* *
* @Title: editProWorkloadMationInProcess
* @Description: 在工作流中编辑工作量信息
* @param inputObject
* @param outputObject
* @throws Exception 参数
* @return void 返回类型
* @throws
*/
@RequestMapping("/post/ProWorkloadController/editProWorkloadMationInProcess")
@ResponseBody
public void editProWorkloadMationInProcess(InputObject inputObject, OutputObject outputObject) throws Exception {
proWorkloadService.editProWorkloadMationInProcess(inputObject, outputObject);
}
/**
*
* @Title: deleteProWorkloadMationById * @Title: deleteProWorkloadMationById
* @Description: 删除工作量 * @Description: 删除工作量
* @param inputObject * @param inputObject
......
skyeye-pro/src/main/java/com/skyeye/service/ProCostExpenseService.java
浏览文件 @ 7b84eeb8
...@@ -33,8 +33,6 @@ public interface ProCostExpenseService { ...@@ -33,8 +33,6 @@ public interface ProCostExpenseService {
public void editProCostExpenseProcessToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception; public void editProCostExpenseProcessToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception;
public void editProCostExpenseMationInProcess(InputObject inputObject, OutputObject outputObject) throws Exception;
public void deleteProCostExpenseMationById(InputObject inputObject, OutputObject outputObject) throws Exception; public void deleteProCostExpenseMationById(InputObject inputObject, OutputObject outputObject) throws Exception;
public void updateProCostExpenseToCancellation(InputObject inputObject, OutputObject outputObject) throws Exception; public void updateProCostExpenseToCancellation(InputObject inputObject, OutputObject outputObject) throws Exception;
......
skyeye-pro/src/main/java/com/skyeye/service/ProFileService.java
浏览文件 @ 7b84eeb8
...@@ -33,8 +33,6 @@ public interface ProFileService { ...@@ -33,8 +33,6 @@ public interface ProFileService {
public void editProFileProcessToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception; public void editProFileProcessToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception;
public void editProFileMationInProcess(InputObject inputObject, OutputObject outputObject) throws Exception;
public void deleteProFileMationById(InputObject inputObject, OutputObject outputObject) throws Exception; public void deleteProFileMationById(InputObject inputObject, OutputObject outputObject) throws Exception;
public void updateProFileToCancellation(InputObject inputObject, OutputObject outputObject) throws Exception; public void updateProFileToCancellation(InputObject inputObject, OutputObject outputObject) throws Exception;
......
skyeye-pro/src/main/java/com/skyeye/service/ProProjectService.java
浏览文件 @ 7b84eeb8
/******************************************************************************* /*******************************************************************************
* Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
******************************************************************************/ ******************************************************************************/
package com.skyeye.service; package com.skyeye.service;
import com.skyeye.common.object.InputObject; import com.skyeye.common.object.InputObject;
...@@ -39,6 +40,4 @@ public interface ProProjectService { ...@@ -39,6 +40,4 @@ public interface ProProjectService {
public void queryProjectProcessToPerFectShowById(InputObject inputObject, OutputObject outputObject) throws Exception; public void queryProjectProcessToPerFectShowById(InputObject inputObject, OutputObject outputObject) throws Exception;
public void editProjectProcessToPerFectById(InputObject inputObject, OutputObject outputObject) throws Exception; public void editProjectProcessToPerFectById(InputObject inputObject, OutputObject outputObject) throws Exception;
public void editProjectMationInProcess(InputObject inputObject, OutputObject outputObject) throws Exception;
} }
skyeye-pro/src/main/java/com/skyeye/service/ProTaskService.java
浏览文件 @ 7b84eeb8
...@@ -37,8 +37,6 @@ public interface ProTaskService { ...@@ -37,8 +37,6 @@ public interface ProTaskService {
public void updateProTaskToCancellation(InputObject inputObject, OutputObject outputObject) throws Exception; public void updateProTaskToCancellation(InputObject inputObject, OutputObject outputObject) throws Exception;
public void editProTaskMationInProcess(InputObject inputObject, OutputObject outputObject) throws Exception;
public void queryMyProTaskList(InputObject inputObject, OutputObject outputObject) throws Exception; public void queryMyProTaskList(InputObject inputObject, OutputObject outputObject) throws Exception;
public void updateProTaskToExecutionBegin(InputObject inputObject, OutputObject outputObject) throws Exception; public void updateProTaskToExecutionBegin(InputObject inputObject, OutputObject outputObject) throws Exception;
......
skyeye-pro/src/main/java/com/skyeye/service/ProWorkloadService.java
浏览文件 @ 7b84eeb8
/******************************************************************************* /*******************************************************************************
* Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
******************************************************************************/ ******************************************************************************/
package com.skyeye.service; package com.skyeye.service;
import com.skyeye.common.object.InputObject; import com.skyeye.common.object.InputObject;
...@@ -24,8 +25,6 @@ public interface ProWorkloadService { ...@@ -24,8 +25,6 @@ public interface ProWorkloadService {
public void editProWorkloadMation(InputObject inputObject, OutputObject outputObject) throws Exception; public void editProWorkloadMation(InputObject inputObject, OutputObject outputObject) throws Exception;
public void editProWorkloadMationInProcess(InputObject inputObject, OutputObject outputObject) throws Exception;
public void deleteProWorkloadMationById(InputObject inputObject, OutputObject outputObject) throws Exception; public void deleteProWorkloadMationById(InputObject inputObject, OutputObject outputObject) throws Exception;
public void updateProWorkloadToCancellation(InputObject inputObject, OutputObject outputObject) throws Exception; public void updateProWorkloadToCancellation(InputObject inputObject, OutputObject outputObject) throws Exception;
......
skyeye-pro/src/main/java/com/skyeye/service/impl/ProCostExpenseServiceImpl.java
浏览文件 @ 7b84eeb8
...@@ -8,6 +8,8 @@ import cn.hutool.json.JSONUtil; ...@@ -8,6 +8,8 @@ import cn.hutool.json.JSONUtil;
import com.github.pagehelper.Page; import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.skyeye.activiti.factory.ActivitiRunFactory; import com.skyeye.activiti.factory.ActivitiRunFactory;
import com.skyeye.activiti.service.ActivitiUserService;
import com.skyeye.annotation.transaction.ActivitiAndBaseTransaction;
import com.skyeye.common.constans.ActivitiConstants; import com.skyeye.common.constans.ActivitiConstants;
import com.skyeye.common.object.InputObject; import com.skyeye.common.object.InputObject;
import com.skyeye.common.object.OutputObject; import com.skyeye.common.object.OutputObject;
...@@ -18,7 +20,6 @@ import com.skyeye.eve.dao.SysEnclosureDao; ...@@ -18,7 +20,6 @@ import com.skyeye.eve.dao.SysEnclosureDao;
import com.skyeye.service.ProCostExpenseService; import com.skyeye.service.ProCostExpenseService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -44,6 +45,9 @@ public class ProCostExpenseServiceImpl implements ProCostExpenseService { ...@@ -44,6 +45,9 @@ public class ProCostExpenseServiceImpl implements ProCostExpenseService {
@Autowired @Autowired
private SysEnclosureDao sysEnclosureDao; private SysEnclosureDao sysEnclosureDao;
@Autowired
private ActivitiUserService activitiUserService;
/** /**
* 项目费用报销提交到工作流中的key * 项目费用报销提交到工作流中的key
*/ */
...@@ -84,7 +88,7 @@ public class ProCostExpenseServiceImpl implements ProCostExpenseService { ...@@ -84,7 +88,7 @@ public class ProCostExpenseServiceImpl implements ProCostExpenseService {
* @throws * @throws
*/ */
@Override @Override
@Transactional(value="transactionManager") @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void insertProCostExpenseMation(InputObject inputObject, OutputObject outputObject) throws Exception { public void insertProCostExpenseMation(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
String expensePurposeStr = map.get("expensePurposeStr").toString(); String expensePurposeStr = map.get("expensePurposeStr").toString();
...@@ -92,12 +96,11 @@ public class ProCostExpenseServiceImpl implements ProCostExpenseService { ...@@ -92,12 +96,11 @@ public class ProCostExpenseServiceImpl implements ProCostExpenseService {
String expenseId = ToolUtil.getSurFaceId();//报销主表id String expenseId = ToolUtil.getSurFaceId();//报销主表id
// 处理数据 // 处理数据
List<Map<String, Object>> jArray = JSONUtil.toList(expensePurposeStr, null); List<Map<String, Object>> jArray = JSONUtil.toList(expensePurposeStr, null);
Map<String, Object> bean;
List<Map<String, Object>> entitys = new ArrayList<>();//费用用途详细集合信息 List<Map<String, Object>> entitys = new ArrayList<>();//费用用途详细集合信息
BigDecimal allPrice = new BigDecimal("0");//主单总价 BigDecimal allPrice = new BigDecimal("0");//主单总价
BigDecimal itemAllPrice = null;//子单对象 BigDecimal itemAllPrice = null;//子单对象
for(int i = 0; i < jArray.size(); i++){ for(int i = 0; i < jArray.size(); i++){
bean = jArray.get(i); Map<String, Object> bean = jArray.get(i);
bean.put("id", ToolUtil.getSurFaceId()); bean.put("id", ToolUtil.getSurFaceId());
bean.put("expenseId", expenseId);//报销主表id bean.put("expenseId", expenseId);//报销主表id
entitys.add(bean); entitys.add(bean);
...@@ -117,11 +120,9 @@ public class ProCostExpenseServiceImpl implements ProCostExpenseService { ...@@ -117,11 +120,9 @@ public class ProCostExpenseServiceImpl implements ProCostExpenseService {
map.put("createTime", DateUtil.getTimeAndToString()); map.put("createTime", DateUtil.getTimeAndToString());
proCostExpenseDao.insertProCostExpenseMation(map); proCostExpenseDao.insertProCostExpenseMation(map);
proCostExpenseDao.insertProCostExpensePurposeMation(entitys); proCostExpenseDao.insertProCostExpensePurposeMation(entitys);
// 判断是否提交审批 // 操作工作流数据
if("2".equals(map.get("subType").toString())){ activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
// 提交审批 PRO_COST_EXPENSE_PAGE_KEY, expenseId, map.get("approvalId").toString());
ActivitiRunFactory.run(inputObject, outputObject, PRO_COST_EXPENSE_PAGE_KEY).submitToActivi(expenseId, ActivitiConstants.APPROVAL_ID);
}
}else{ }else{
outputObject.setreturnMessage("数据格式错误"); outputObject.setreturnMessage("数据格式错误");
} }
...@@ -186,6 +187,7 @@ public class ProCostExpenseServiceImpl implements ProCostExpenseService { ...@@ -186,6 +187,7 @@ public class ProCostExpenseServiceImpl implements ProCostExpenseService {
* @throws * @throws
*/ */
@Override @Override
@ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void editProCostExpenseMation(InputObject inputObject, OutputObject outputObject) throws Exception { public void editProCostExpenseMation(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
String expensePurposeStr = map.get("expensePurposeStr").toString(); String expensePurposeStr = map.get("expensePurposeStr").toString();
...@@ -214,11 +216,9 @@ public class ProCostExpenseServiceImpl implements ProCostExpenseService { ...@@ -214,11 +216,9 @@ public class ProCostExpenseServiceImpl implements ProCostExpenseService {
proCostExpenseDao.editProCostExpenseMation(map); proCostExpenseDao.editProCostExpenseMation(map);
proCostExpenseDao.deleteProCostExpensePurposeById(map); proCostExpenseDao.deleteProCostExpensePurposeById(map);
proCostExpenseDao.insertProCostExpensePurposeMation(entitys); proCostExpenseDao.insertProCostExpensePurposeMation(entitys);
// 判断是否提交审批 // 操作工作流数据
if("2".equals(map.get("subType").toString())){ activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
// 提交审批 PRO_COST_EXPENSE_PAGE_KEY, expenseId, map.get("approvalId").toString());
ActivitiRunFactory.run(inputObject, outputObject, PRO_COST_EXPENSE_PAGE_KEY).submitToActivi(expenseId, ActivitiConstants.APPROVAL_ID);
}
}else{ }else{
outputObject.setreturnMessage("数据格式错误"); outputObject.setreturnMessage("数据格式错误");
} }
...@@ -235,6 +235,7 @@ public class ProCostExpenseServiceImpl implements ProCostExpenseService { ...@@ -235,6 +235,7 @@ public class ProCostExpenseServiceImpl implements ProCostExpenseService {
* @throws * @throws
*/ */
@Override @Override
@ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void editProCostExpenseToApprovalById(InputObject inputObject, OutputObject outputObject) throws Exception { public void editProCostExpenseToApprovalById(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
String id = map.get("id").toString(); String id = map.get("id").toString();
...@@ -242,7 +243,8 @@ public class ProCostExpenseServiceImpl implements ProCostExpenseService { ...@@ -242,7 +243,8 @@ public class ProCostExpenseServiceImpl implements ProCostExpenseService {
Integer state = Integer.parseInt(bean.get("state").toString()); Integer state = Integer.parseInt(bean.get("state").toString());
if(0 == state || 12 == state || 3 == state){ if(0 == state || 12 == state || 3 == state){
// 草稿、审核不通过、撤销状态下可以提交审批 // 草稿、审核不通过、撤销状态下可以提交审批
ActivitiRunFactory.run(inputObject, outputObject, PRO_COST_EXPENSE_PAGE_KEY).submitToActivi(id, ActivitiConstants.APPROVAL_ID); activitiUserService.addOrEditToSubmit(inputObject, outputObject, 2,
PRO_COST_EXPENSE_PAGE_KEY, id, map.get("approvalId").toString());
}else{ }else{
outputObject.setreturnMessage("该数据状态已改变，请刷新页面！"); outputObject.setreturnMessage("该数据状态已改变，请刷新页面！");
} }
...@@ -259,57 +261,11 @@ public class ProCostExpenseServiceImpl implements ProCostExpenseService { ...@@ -259,57 +261,11 @@ public class ProCostExpenseServiceImpl implements ProCostExpenseService {
* @throws * @throws
*/ */
@Override @Override
@ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void editProCostExpenseProcessToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception { public void editProCostExpenseProcessToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception {
ActivitiRunFactory.run(inputObject, outputObject, PRO_COST_EXPENSE_PAGE_KEY).revokeActivi(); ActivitiRunFactory.run(inputObject, outputObject, PRO_COST_EXPENSE_PAGE_KEY).revokeActivi();
} }
/**
*
* @Title: editProCostExpenseMationInProcess
* @Description: 在工作流中编辑费用报销信息
* @param inputObject
* @param outputObject
* @throws Exception 参数
* @return void 返回类型
* @throws
*/
@Override
public void editProCostExpenseMationInProcess(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams();
String expensePurposeStr = map.get("expensePurposeStr").toString();
if(ToolUtil.isJson(expensePurposeStr)){
String expenseId = map.get("id").toString();//报销主表id
// 处理数据
List<Map<String, Object>> jArray = JSONUtil.toList(expensePurposeStr, null);
Map<String, Object> bean;
List<Map<String, Object>> entitys = new ArrayList<>();////费用用途详细集合信息
BigDecimal allPrice = new BigDecimal("0");//主单总价
BigDecimal itemAllPrice = null;//子单对象
for(int i = 0; i < jArray.size(); i++){
bean = jArray.get(i);
bean.put("id", ToolUtil.getSurFaceId());
bean.put("expenseId", expenseId);//报销主表id
entitys.add(bean);
//计算主单总价
itemAllPrice = new BigDecimal(bean.get("price").toString());
allPrice = allPrice.add(itemAllPrice);
}
if(entitys.size() == 0){
outputObject.setreturnMessage("请填写项目成本费用用途详细");
return;
}
map.put("allPrice", allPrice);//合计金额
proCostExpenseDao.editProCostExpenseMation(map);
proCostExpenseDao.deleteProCostExpensePurposeById(map);
proCostExpenseDao.insertProCostExpensePurposeMation(entitys);
// 编辑流程表参数
ActivitiRunFactory.run(inputObject, outputObject, PRO_COST_EXPENSE_PAGE_KEY).editApplyMationInActiviti(expenseId);
}else{
outputObject.setreturnMessage("数据格式错误");
}
}
/** /**
* *
* @Title: deleteProCostExpenseMationById * @Title: deleteProCostExpenseMationById
......
skyeye-pro/src/main/java/com/skyeye/service/impl/ProFileServiceImpl.java
浏览文件 @ 7b84eeb8
...@@ -7,6 +7,8 @@ package com.skyeye.service.impl; ...@@ -7,6 +7,8 @@ package com.skyeye.service.impl;
import com.github.pagehelper.Page; import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.skyeye.activiti.factory.ActivitiRunFactory; import com.skyeye.activiti.factory.ActivitiRunFactory;
import com.skyeye.activiti.service.ActivitiUserService;
import com.skyeye.annotation.transaction.ActivitiAndBaseTransaction;
import com.skyeye.common.constans.ActivitiConstants; import com.skyeye.common.constans.ActivitiConstants;
import com.skyeye.common.object.InputObject; import com.skyeye.common.object.InputObject;
import com.skyeye.common.object.OutputObject; import com.skyeye.common.object.OutputObject;
...@@ -17,7 +19,6 @@ import com.skyeye.eve.dao.SysEnclosureDao; ...@@ -17,7 +19,6 @@ import com.skyeye.eve.dao.SysEnclosureDao;
import com.skyeye.service.ProFileService; import com.skyeye.service.ProFileService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -41,6 +42,9 @@ public class ProFileServiceImpl implements ProFileService { ...@@ -41,6 +42,9 @@ public class ProFileServiceImpl implements ProFileService {
@Autowired @Autowired
private SysEnclosureDao sysEnclosureDao; private SysEnclosureDao sysEnclosureDao;
@Autowired
private ActivitiUserService activitiUserService;
/** /**
* 项目文档审核在工作流中配置的key * 项目文档审核在工作流中配置的key
*/ */
...@@ -61,6 +65,7 @@ public class ProFileServiceImpl implements ProFileService { ...@@ -61,6 +65,7 @@ public class ProFileServiceImpl implements ProFileService {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
String userId = inputObject.getLogParams().get("id").toString(); String userId = inputObject.getLogParams().get("id").toString();
map.put("userId", userId); map.put("userId", userId);
map.put("pageUrl", PRO_FILE_PAGE_KEY);
Page pages = PageHelper.startPage(Integer.parseInt(map.get("page").toString()), Integer.parseInt(map.get("limit").toString())); Page pages = PageHelper.startPage(Integer.parseInt(map.get("page").toString()), Integer.parseInt(map.get("limit").toString()));
List<Map<String, Object>> beans = proFileDao.queryProFileList(map); List<Map<String, Object>> beans = proFileDao.queryProFileList(map);
for(Map<String, Object> bean : beans){ for(Map<String, Object> bean : beans){
...@@ -82,7 +87,7 @@ public class ProFileServiceImpl implements ProFileService { ...@@ -82,7 +87,7 @@ public class ProFileServiceImpl implements ProFileService {
* @throws * @throws
*/ */
@Override @Override
@Transactional(value="transactionManager") @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void insertProFileMation(InputObject inputObject, OutputObject outputObject) throws Exception { public void insertProFileMation(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
Map<String, Object> bean = proFileDao.queryProFileByTitle(map); Map<String, Object> bean = proFileDao.queryProFileByTitle(map);
...@@ -98,11 +103,9 @@ public class ProFileServiceImpl implements ProFileService { ...@@ -98,11 +103,9 @@ public class ProFileServiceImpl implements ProFileService {
map.put("createTime", time); map.put("createTime", time);
map.put("updateTime", time); map.put("updateTime", time);
proFileDao.insertProFileMation(map); proFileDao.insertProFileMation(map);
// 判断是否提交审批 // 操作工作流数据
if("2".equals(map.get("subType").toString())){ activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
// 提交审批 PRO_FILE_PAGE_KEY, id, map.get("approvalId").toString());
ActivitiRunFactory.run(inputObject, outputObject, PRO_FILE_PAGE_KEY).submitToActivi(id, ActivitiConstants.APPROVAL_ID);
}
} }
} }
...@@ -160,6 +163,7 @@ public class ProFileServiceImpl implements ProFileService { ...@@ -160,6 +163,7 @@ public class ProFileServiceImpl implements ProFileService {
* @throws * @throws
*/ */
@Override @Override
@ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void editProFileMation(InputObject inputObject, OutputObject outputObject) throws Exception { public void editProFileMation(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
Map<String, Object> bean = proFileDao.queryProFileByTitle(map); Map<String, Object> bean = proFileDao.queryProFileByTitle(map);
...@@ -168,11 +172,9 @@ public class ProFileServiceImpl implements ProFileService { ...@@ -168,11 +172,9 @@ public class ProFileServiceImpl implements ProFileService {
}else{ }else{
String id = map.get("id").toString();//文档id String id = map.get("id").toString();//文档id
proFileDao.editProFileMation(map); proFileDao.editProFileMation(map);
// 判断是否提交审批 // 操作工作流数据
if("2".equals(map.get("subType").toString())){ activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
// 提交审批 PRO_FILE_PAGE_KEY, id, map.get("approvalId").toString());
ActivitiRunFactory.run(inputObject, outputObject, PRO_FILE_PAGE_KEY).submitToActivi(id, ActivitiConstants.APPROVAL_ID);
}
} }
} }
...@@ -187,6 +189,7 @@ public class ProFileServiceImpl implements ProFileService { ...@@ -187,6 +189,7 @@ public class ProFileServiceImpl implements ProFileService {
* @throws * @throws
*/ */
@Override @Override
@ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void editProFileToApprovalById(InputObject inputObject, OutputObject outputObject) throws Exception { public void editProFileToApprovalById(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
String id = map.get("id").toString(); String id = map.get("id").toString();
...@@ -195,7 +198,8 @@ public class ProFileServiceImpl implements ProFileService { ...@@ -195,7 +198,8 @@ public class ProFileServiceImpl implements ProFileService {
Integer state = Integer.parseInt(bean.get("state").toString()); Integer state = Integer.parseInt(bean.get("state").toString());
if(0 == state || 12 == state || 3 == state){ if(0 == state || 12 == state || 3 == state){
// 草稿、审核不通过、撤销状态下可以提交审批 // 草稿、审核不通过、撤销状态下可以提交审批
ActivitiRunFactory.run(inputObject, outputObject, PRO_FILE_PAGE_KEY).submitToActivi(id, ActivitiConstants.APPROVAL_ID); activitiUserService.addOrEditToSubmit(inputObject, outputObject, 2,
PRO_FILE_PAGE_KEY, id, map.get("approvalId").toString());
}else{ }else{
outputObject.setreturnMessage("该数据状态已改变，请刷新页面！"); outputObject.setreturnMessage("该数据状态已改变，请刷新页面！");
} }
...@@ -212,34 +216,11 @@ public class ProFileServiceImpl implements ProFileService { ...@@ -212,34 +216,11 @@ public class ProFileServiceImpl implements ProFileService {
* @throws * @throws
*/ */
@Override @Override
@ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void editProFileProcessToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception { public void editProFileProcessToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception {
ActivitiRunFactory.run(inputObject, outputObject, PRO_FILE_PAGE_KEY).revokeActivi(); ActivitiRunFactory.run(inputObject, outputObject, PRO_FILE_PAGE_KEY).revokeActivi();
} }
/**
*
* @Title: editProFileMationInProcess
* @Description: 在工作流中编辑文档信息
* @param inputObject
* @param outputObject
* @throws Exception 参数
* @return void 返回类型
* @throws
*/
@Override
public void editProFileMationInProcess(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams();
Map<String, Object> bean = proFileDao.queryProFileByTitle(map);
if(bean == null){
String id = map.get("id").toString();
proFileDao.editProFileMation(map);
// 编辑流程表参数
ActivitiRunFactory.run(inputObject, outputObject, PRO_FILE_PAGE_KEY).editApplyMationInActiviti(id);
}else{
outputObject.setreturnMessage("该文档名称已存在，不可进行二次保存");
}
}
/** /**
* *
* @Title: deleteProFileMationById * @Title: deleteProFileMationById
...@@ -302,6 +283,7 @@ public class ProFileServiceImpl implements ProFileService { ...@@ -302,6 +283,7 @@ public class ProFileServiceImpl implements ProFileService {
@Override @Override
public void queryAllProFileList(InputObject inputObject, OutputObject outputObject) throws Exception { public void queryAllProFileList(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
map.put("pageUrl", PRO_FILE_PAGE_KEY);
Page pages = PageHelper.startPage(Integer.parseInt(map.get("page").toString()), Integer.parseInt(map.get("limit").toString())); Page pages = PageHelper.startPage(Integer.parseInt(map.get("page").toString()), Integer.parseInt(map.get("limit").toString()));
List<Map<String, Object>> beans = proFileDao.queryAllProFileList(map); List<Map<String, Object>> beans = proFileDao.queryAllProFileList(map);
outputObject.setBeans(beans); outputObject.setBeans(beans);
......
skyeye-pro/src/main/java/com/skyeye/service/impl/ProProjectServiceImpl.java
浏览文件 @ 7b84eeb8
...@@ -7,6 +7,8 @@ package com.skyeye.service.impl; ...@@ -7,6 +7,8 @@ package com.skyeye.service.impl;
import com.github.pagehelper.Page; import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.skyeye.activiti.factory.ActivitiRunFactory; import com.skyeye.activiti.factory.ActivitiRunFactory;
import com.skyeye.activiti.service.ActivitiUserService;
import com.skyeye.annotation.transaction.ActivitiAndBaseTransaction;
import com.skyeye.common.constans.ActivitiConstants; import com.skyeye.common.constans.ActivitiConstants;
import com.skyeye.common.object.InputObject; import com.skyeye.common.object.InputObject;
import com.skyeye.common.object.OutputObject; import com.skyeye.common.object.OutputObject;
...@@ -41,6 +43,9 @@ public class ProProjectServiceImpl implements ProProjectService { ...@@ -41,6 +43,9 @@ public class ProProjectServiceImpl implements ProProjectService {
@Autowired @Autowired
private SysEnclosureDao sysEnclosureDao; private SysEnclosureDao sysEnclosureDao;
@Autowired
private ActivitiUserService activitiUserService;
/** /**
* 项目立项在工作流中的key * 项目立项在工作流中的key
*/ */
...@@ -57,6 +62,7 @@ public class ProProjectServiceImpl implements ProProjectService { ...@@ -57,6 +62,7 @@ public class ProProjectServiceImpl implements ProProjectService {
@Override @Override
public void queryAllProProjectList(InputObject inputObject, OutputObject outputObject) throws Exception { public void queryAllProProjectList(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
map.put("pageUrl", PRO_PROJECT_PAGE_KEY);
Page pages = PageHelper.startPage(Integer.parseInt(map.get("page").toString()), Integer.parseInt(map.get("limit").toString())); Page pages = PageHelper.startPage(Integer.parseInt(map.get("page").toString()), Integer.parseInt(map.get("limit").toString()));
List<Map<String, Object>> beans = proProjectDao.queryAllProProjectList(map); List<Map<String, Object>> beans = proProjectDao.queryAllProProjectList(map);
outputObject.setBeans(beans); outputObject.setBeans(beans);
...@@ -77,6 +83,7 @@ public class ProProjectServiceImpl implements ProProjectService { ...@@ -77,6 +83,7 @@ public class ProProjectServiceImpl implements ProProjectService {
Map<String, Object> user = inputObject.getLogParams(); Map<String, Object> user = inputObject.getLogParams();
String userId = user.get("id").toString(); String userId = user.get("id").toString();
map.put("userId", userId); map.put("userId", userId);
map.put("pageUrl", PRO_PROJECT_PAGE_KEY);
Page pages = PageHelper.startPage(Integer.parseInt(map.get("page").toString()), Integer.parseInt(map.get("limit").toString())); Page pages = PageHelper.startPage(Integer.parseInt(map.get("page").toString()), Integer.parseInt(map.get("limit").toString()));
List<Map<String, Object>> beans = proProjectDao.queryMyProProjectList(map); List<Map<String, Object>> beans = proProjectDao.queryMyProProjectList(map);
for (Map<String, Object> bean : beans){ for (Map<String, Object> bean : beans){
...@@ -97,7 +104,7 @@ public class ProProjectServiceImpl implements ProProjectService { ...@@ -97,7 +104,7 @@ public class ProProjectServiceImpl implements ProProjectService {
* @throws Exception * @throws Exception
*/ */
@Override @Override
@Transactional(value = "transactionManager") @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void insertProProjectMation(InputObject inputObject, OutputObject outputObject) throws Exception { public void insertProProjectMation(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
List<Map<String, Object>> beans = proProjectDao.queryProProjectMationByNameAndNum(map); List<Map<String, Object>> beans = proProjectDao.queryProProjectMationByNameAndNum(map);
...@@ -113,11 +120,9 @@ public class ProProjectServiceImpl implements ProProjectService { ...@@ -113,11 +120,9 @@ public class ProProjectServiceImpl implements ProProjectService {
map.put("createId", user.get("id")); map.put("createId", user.get("id"));
map.put("createTime", DateUtil.getTimeAndToString()); map.put("createTime", DateUtil.getTimeAndToString());
proProjectDao.insertProProjectMation(map); proProjectDao.insertProProjectMation(map);
// 判断是否提交审批 // 操作工作流数据
if("2".equals(map.get("subType").toString())){ activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
// 提交审批 PRO_PROJECT_PAGE_KEY, proId, map.get("approvalId").toString());
ActivitiRunFactory.run(inputObject, outputObject, PRO_PROJECT_PAGE_KEY).submitToActivi(proId, ActivitiConstants.APPROVAL_ID);
}
} }
} }
...@@ -217,7 +222,7 @@ public class ProProjectServiceImpl implements ProProjectService { ...@@ -217,7 +222,7 @@ public class ProProjectServiceImpl implements ProProjectService {
* @throws Exception * @throws Exception
*/ */
@Override @Override
@Transactional(value = "transactionManager") @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void editProProjectMationById(InputObject inputObject, OutputObject outputObject) throws Exception { public void editProProjectMationById(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
String proId = map.get("id").toString(); String proId = map.get("id").toString();
...@@ -227,11 +232,9 @@ public class ProProjectServiceImpl implements ProProjectService { ...@@ -227,11 +232,9 @@ public class ProProjectServiceImpl implements ProProjectService {
outputObject.setreturnMessage("项目名称或编号已存在！"); outputObject.setreturnMessage("项目名称或编号已存在！");
}else{ }else{
proProjectDao.editProProjectMationById(map); proProjectDao.editProProjectMationById(map);
// 判断是否提交审批 // 操作工作流数据
if("2".equals(map.get("subType").toString())){ activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
// 提交审批 PRO_PROJECT_PAGE_KEY, proId, map.get("approvalId").toString());
ActivitiRunFactory.run(inputObject, outputObject, PRO_PROJECT_PAGE_KEY).submitToActivi(proId, ActivitiConstants.APPROVAL_ID);
}
} }
} }
...@@ -244,7 +247,7 @@ public class ProProjectServiceImpl implements ProProjectService { ...@@ -244,7 +247,7 @@ public class ProProjectServiceImpl implements ProProjectService {
* @throws Exception * @throws Exception
*/ */
@Override @Override
@Transactional(value="transactionManager") @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void editProProjectMationToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception { public void editProProjectMationToSubApproval(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
String proId = map.get("id").toString(); String proId = map.get("id").toString();
...@@ -253,7 +256,8 @@ public class ProProjectServiceImpl implements ProProjectService { ...@@ -253,7 +256,8 @@ public class ProProjectServiceImpl implements ProProjectService {
|| "12".equals(bean.get("state").toString()) || "12".equals(bean.get("state").toString())
|| "5".equals(bean.get("state").toString())){ || "5".equals(bean.get("state").toString())){
// 草稿、审核不通过或者撤销状态下可以提交审批 // 草稿、审核不通过或者撤销状态下可以提交审批
ActivitiRunFactory.run(inputObject, outputObject, PRO_PROJECT_PAGE_KEY).submitToActivi(proId, ActivitiConstants.APPROVAL_ID); activitiUserService.addOrEditToSubmit(inputObject, outputObject, 2,
PRO_PROJECT_PAGE_KEY, proId, map.get("approvalId").toString());
}else{ }else{
outputObject.setreturnMessage("该数据状态已改变，请刷新页面！"); outputObject.setreturnMessage("该数据状态已改变，请刷新页面！");
} }
...@@ -295,7 +299,7 @@ public class ProProjectServiceImpl implements ProProjectService { ...@@ -295,7 +299,7 @@ public class ProProjectServiceImpl implements ProProjectService {
* @throws * @throws
*/ */
@Override @Override
@Transactional(value="transactionManager") @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void editProjectProcessToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception { public void editProjectProcessToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception {
ActivitiRunFactory.run(inputObject, outputObject, PRO_PROJECT_PAGE_KEY).revokeActivi(); ActivitiRunFactory.run(inputObject, outputObject, PRO_PROJECT_PAGE_KEY).revokeActivi();
} }
...@@ -465,27 +469,4 @@ public class ProProjectServiceImpl implements ProProjectService { ...@@ -465,27 +469,4 @@ public class ProProjectServiceImpl implements ProProjectService {
} }
} }
/**
* 在工作流中编辑项目信息
*
* @param inputObject
* @param outputObject
* @throws Exception
*/
@Override
@Transactional(value="transactionManager")
public void editProjectMationInProcess(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams();
String proId = map.get("id").toString();
List<Map<String, Object>> beans = proProjectDao.queryProProjectMationByNameAndId(map);
if(beans != null && beans.size() > 0){
outputObject.setreturnMessage("项目名称或编号已存在！");
}else{
setOtherParams(map);
proProjectDao.editProProjectMationById(map);
// 编辑流程表参数
ActivitiRunFactory.run(inputObject, outputObject, PRO_PROJECT_PAGE_KEY).editApplyMationInActiviti(proId);
}
}
} }
skyeye-pro/src/main/java/com/skyeye/service/impl/ProTaskServiceImpl.java
浏览文件 @ 7b84eeb8
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
package com.skyeye.service.impl; package com.skyeye.service.impl;
import com.skyeye.activiti.factory.ActivitiRunFactory; import com.skyeye.activiti.factory.ActivitiRunFactory;
import com.skyeye.activiti.service.ActivitiUserService;
import com.skyeye.annotation.transaction.ActivitiAndBaseTransaction;
import com.skyeye.common.constans.ActivitiConstants; import com.skyeye.common.constans.ActivitiConstants;
import com.skyeye.common.object.InputObject; import com.skyeye.common.object.InputObject;
import com.skyeye.common.object.OutputObject; import com.skyeye.common.object.OutputObject;
...@@ -39,6 +41,9 @@ public class ProTaskServiceImpl implements ProTaskService { ...@@ -39,6 +41,9 @@ public class ProTaskServiceImpl implements ProTaskService {
@Autowired @Autowired
private SysEnclosureDao sysEnclosureDao; private SysEnclosureDao sysEnclosureDao;
@Autowired
private ActivitiUserService activitiUserService;
/** /**
* 项目任务申请在工作流中的key * 项目任务申请在工作流中的key
*/ */
...@@ -79,7 +84,7 @@ public class ProTaskServiceImpl implements ProTaskService { ...@@ -79,7 +84,7 @@ public class ProTaskServiceImpl implements ProTaskService {
* @throws * @throws
*/ */
@Override @Override
@Transactional(value = "transactionManager") @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void insertProTaskMation(InputObject inputObject, OutputObject outputObject) throws Exception { public void insertProTaskMation(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
Map<String, Object> bean = proTaskDao.queryProTaskByTaskName(map); Map<String, Object> bean = proTaskDao.queryProTaskByTaskName(map);
...@@ -95,11 +100,9 @@ public class ProTaskServiceImpl implements ProTaskService { ...@@ -95,11 +100,9 @@ public class ProTaskServiceImpl implements ProTaskService {
map.put("createId", user.get("id")); map.put("createId", user.get("id"));
map.put("createTime", DateUtil.getTimeAndToString()); map.put("createTime", DateUtil.getTimeAndToString());
proTaskDao.insertProTaskMation(map); proTaskDao.insertProTaskMation(map);
// 判断是否提交审批 // 操作工作流数据
if("2".equals(map.get("subType").toString())){ activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
// 提交审批 PRO_TASK_PAGE_KEY, id, map.get("approvalId").toString());
ActivitiRunFactory.run(inputObject, outputObject, PRO_TASK_PAGE_KEY).submitToActivi(id, ActivitiConstants.APPROVAL_ID);
}
} }
} }
...@@ -163,7 +166,7 @@ public class ProTaskServiceImpl implements ProTaskService { ...@@ -163,7 +166,7 @@ public class ProTaskServiceImpl implements ProTaskService {
* @throws * @throws
*/ */
@Override @Override
@Transactional(value="transactionManager") @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void editProTaskMation(InputObject inputObject, OutputObject outputObject) throws Exception { public void editProTaskMation(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
Map<String, Object> bean = proTaskDao.queryProTaskByTaskName(map); Map<String, Object> bean = proTaskDao.queryProTaskByTaskName(map);
...@@ -175,11 +178,9 @@ public class ProTaskServiceImpl implements ProTaskService { ...@@ -175,11 +178,9 @@ public class ProTaskServiceImpl implements ProTaskService {
map.put("endTime", null); map.put("endTime", null);
} }
proTaskDao.editProTaskMation(map); proTaskDao.editProTaskMation(map);
// 判断是否提交审批 // 操作工作流数据
if("2".equals(map.get("subType").toString())){ activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
// 提交审批 PRO_TASK_PAGE_KEY, taskId, map.get("approvalId").toString());
ActivitiRunFactory.run(inputObject, outputObject, PRO_TASK_PAGE_KEY).submitToActivi(taskId, ActivitiConstants.APPROVAL_ID);
}
} }
} }
...@@ -223,7 +224,7 @@ public class ProTaskServiceImpl implements ProTaskService { ...@@ -223,7 +224,7 @@ public class ProTaskServiceImpl implements ProTaskService {
* @throws * @throws
*/ */
@Override @Override
@Transactional(value = "transactionManager") @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void editProTaskProcessToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception { public void editProTaskProcessToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception {
ActivitiRunFactory.run(inputObject, outputObject, PRO_TASK_PAGE_KEY).revokeActivi(); ActivitiRunFactory.run(inputObject, outputObject, PRO_TASK_PAGE_KEY).revokeActivi();
} }
...@@ -239,7 +240,7 @@ public class ProTaskServiceImpl implements ProTaskService { ...@@ -239,7 +240,7 @@ public class ProTaskServiceImpl implements ProTaskService {
* @throws * @throws
*/ */
@Override @Override
@Transactional(value="transactionManager") @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void editProTaskToApprovalById(InputObject inputObject, OutputObject outputObject) throws Exception { public void editProTaskToApprovalById(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
String id = map.get("id").toString(); String id = map.get("id").toString();
...@@ -249,7 +250,8 @@ public class ProTaskServiceImpl implements ProTaskService { ...@@ -249,7 +250,8 @@ public class ProTaskServiceImpl implements ProTaskService {
|| "12".equals(bean.get("state").toString()) || "12".equals(bean.get("state").toString())
|| "5".equals(bean.get("state").toString())){ || "5".equals(bean.get("state").toString())){
// 草稿、审核不通过、撤销状态下可以提交审批 // 草稿、审核不通过、撤销状态下可以提交审批
ActivitiRunFactory.run(inputObject, outputObject, PRO_TASK_PAGE_KEY).submitToActivi(id, ActivitiConstants.APPROVAL_ID); activitiUserService.addOrEditToSubmit(inputObject, outputObject, 2,
PRO_TASK_PAGE_KEY, id, map.get("approvalId").toString());
}else{ }else{
outputObject.setreturnMessage("该数据状态已改变，请刷新页面！"); outputObject.setreturnMessage("该数据状态已改变，请刷新页面！");
} }
...@@ -286,34 +288,6 @@ public class ProTaskServiceImpl implements ProTaskService { ...@@ -286,34 +288,6 @@ public class ProTaskServiceImpl implements ProTaskService {
/** /**
* *
* @Title: editProTaskMationInProcess
* @Description: 在工作流中编辑任务信息
* @param inputObject
* @param outputObject
* @throws Exception 参数
* @return void 返回类型
* @throws
*/
@Override
@Transactional(value="transactionManager")
public void editProTaskMationInProcess(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams();
Map<String, Object> bean = proTaskDao.queryProTaskByTaskName(map);
if(bean == null){
if(map.get("endTime").toString().isEmpty()){
map.put("endTime", null);
}
String id = map.get("id").toString();
proTaskDao.editProTaskMation(map);
// 编辑流程表参数
ActivitiRunFactory.run(inputObject, outputObject, PRO_TASK_PAGE_KEY).editApplyMationInActiviti(id);
}else{
outputObject.setreturnMessage("该任务名称已存在，不可进行二次保存");
}
}
/**
*
* @Title: queryMyProTaskList * @Title: queryMyProTaskList
* @Description: 获取我的任务列表 * @Description: 获取我的任务列表
* @param inputObject * @param inputObject
...@@ -322,7 +296,6 @@ public class ProTaskServiceImpl implements ProTaskService { ...@@ -322,7 +296,6 @@ public class ProTaskServiceImpl implements ProTaskService {
* @return void 返回类型 * @return void 返回类型
* @throws * @throws
*/ */
@SuppressWarnings("unchecked")
@Override @Override
public void queryMyProTaskList(InputObject inputObject, OutputObject outputObject) throws Exception { public void queryMyProTaskList(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
......
skyeye-pro/src/main/java/com/skyeye/service/impl/ProWorkloadServiceImpl.java
浏览文件 @ 7b84eeb8
...@@ -8,6 +8,8 @@ import cn.hutool.json.JSONUtil; ...@@ -8,6 +8,8 @@ import cn.hutool.json.JSONUtil;
import com.github.pagehelper.Page; import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.skyeye.activiti.factory.ActivitiRunFactory; import com.skyeye.activiti.factory.ActivitiRunFactory;
import com.skyeye.activiti.service.ActivitiUserService;
import com.skyeye.annotation.transaction.ActivitiAndBaseTransaction;
import com.skyeye.common.constans.ActivitiConstants; import com.skyeye.common.constans.ActivitiConstants;
import com.skyeye.common.object.InputObject; import com.skyeye.common.object.InputObject;
import com.skyeye.common.object.OutputObject; import com.skyeye.common.object.OutputObject;
...@@ -18,7 +20,6 @@ import com.skyeye.eve.dao.SysEnclosureDao; ...@@ -18,7 +20,6 @@ import com.skyeye.eve.dao.SysEnclosureDao;
import com.skyeye.service.ProWorkloadService; import com.skyeye.service.ProWorkloadService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -43,6 +44,9 @@ public class ProWorkloadServiceImpl implements ProWorkloadService { ...@@ -43,6 +44,9 @@ public class ProWorkloadServiceImpl implements ProWorkloadService {
@Autowired @Autowired
private SysEnclosureDao sysEnclosureDao; private SysEnclosureDao sysEnclosureDao;
@Autowired
private ActivitiUserService activitiUserService;
private static final String PRO_WORKLOAD_PAGE_KEY = ActivitiConstants.ActivitiObjectType.PRO_WORKLOAD_PAGE.getKey(); private static final String PRO_WORKLOAD_PAGE_KEY = ActivitiConstants.ActivitiObjectType.PRO_WORKLOAD_PAGE.getKey();
/** /**
...@@ -84,7 +88,7 @@ public class ProWorkloadServiceImpl implements ProWorkloadService { ...@@ -84,7 +88,7 @@ public class ProWorkloadServiceImpl implements ProWorkloadService {
* @throws * @throws
*/ */
@Override @Override
@Transactional(value="transactionManager") @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void insertProWorkloadMation(InputObject inputObject, OutputObject outputObject) throws Exception { public void insertProWorkloadMation(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
String workloadId = ToolUtil.getSurFaceId();//工作量主表id String workloadId = ToolUtil.getSurFaceId();//工作量主表id
...@@ -98,11 +102,9 @@ public class ProWorkloadServiceImpl implements ProWorkloadService { ...@@ -98,11 +102,9 @@ public class ProWorkloadServiceImpl implements ProWorkloadService {
map.put("createTime", DateUtil.getTimeAndToString()); map.put("createTime", DateUtil.getTimeAndToString());
proWorkloadDao.insertProWorkloadMation(map); proWorkloadDao.insertProWorkloadMation(map);
proWorkloadDao.insertProWorkloadRelatedTasksMation(entitys); proWorkloadDao.insertProWorkloadRelatedTasksMation(entitys);
// 判断是否提交审批 // 操作工作流数据
if("2".equals(map.get("subType").toString())){ activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
// 提交审批 PRO_WORKLOAD_PAGE_KEY, workloadId, map.get("approvalId").toString());
ActivitiRunFactory.run(inputObject, outputObject, PRO_WORKLOAD_PAGE_KEY).submitToActivi(workloadId, ActivitiConstants.APPROVAL_ID);
}
} }
private List<Map<String, Object>> getWorkloadTaskList(OutputObject outputObject, String workloadTaskStr, String workloadId) { private List<Map<String, Object>> getWorkloadTaskList(OutputObject outputObject, String workloadTaskStr, String workloadId) {
...@@ -153,7 +155,7 @@ public class ProWorkloadServiceImpl implements ProWorkloadService { ...@@ -153,7 +155,7 @@ public class ProWorkloadServiceImpl implements ProWorkloadService {
* @throws * @throws
*/ */
@Override @Override
@Transactional(value="transactionManager") @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void editProWorkloadToApprovalById(InputObject inputObject, OutputObject outputObject) throws Exception { public void editProWorkloadToApprovalById(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
String workloadId = map.get("id").toString(); String workloadId = map.get("id").toString();
...@@ -163,7 +165,8 @@ public class ProWorkloadServiceImpl implements ProWorkloadService { ...@@ -163,7 +165,8 @@ public class ProWorkloadServiceImpl implements ProWorkloadService {
|| "12".equals(bean.get("state").toString()) || "12".equals(bean.get("state").toString())
|| "3".equals(bean.get("state").toString())){ || "3".equals(bean.get("state").toString())){
// 草稿、审核不通过、撤销状态下可以提交审批 // 草稿、审核不通过、撤销状态下可以提交审批
ActivitiRunFactory.run(inputObject, outputObject, PRO_WORKLOAD_PAGE_KEY).submitToActivi(workloadId, ActivitiConstants.APPROVAL_ID); activitiUserService.addOrEditToSubmit(inputObject, outputObject, 2,
PRO_WORKLOAD_PAGE_KEY, workloadId, map.get("approvalId").toString());
}else{ }else{
outputObject.setreturnMessage("该数据状态已改变，请刷新页面！"); outputObject.setreturnMessage("该数据状态已改变，请刷新页面！");
} }
...@@ -180,7 +183,7 @@ public class ProWorkloadServiceImpl implements ProWorkloadService { ...@@ -180,7 +183,7 @@ public class ProWorkloadServiceImpl implements ProWorkloadService {
* @throws * @throws
*/ */
@Override @Override
@Transactional(value="transactionManager") @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void editProWorkloadProcessToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception { public void editProWorkloadProcessToRevoke(InputObject inputObject, OutputObject outputObject) throws Exception {
ActivitiRunFactory.run(inputObject, outputObject, PRO_WORKLOAD_PAGE_KEY).revokeActivi(); ActivitiRunFactory.run(inputObject, outputObject, PRO_WORKLOAD_PAGE_KEY).revokeActivi();
} }
...@@ -244,7 +247,7 @@ public class ProWorkloadServiceImpl implements ProWorkloadService { ...@@ -244,7 +247,7 @@ public class ProWorkloadServiceImpl implements ProWorkloadService {
* @throws * @throws
*/ */
@Override @Override
@Transactional(value="transactionManager") @ActivitiAndBaseTransaction(value = {"activitiTransactionManager", "transactionManager"})
public void editProWorkloadMation(InputObject inputObject, OutputObject outputObject) throws Exception { public void editProWorkloadMation(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams(); Map<String, Object> map = inputObject.getParams();
String workloadId = map.get("id").toString();//工作量主表id String workloadId = map.get("id").toString();//工作量主表id
...@@ -254,35 +257,9 @@ public class ProWorkloadServiceImpl implements ProWorkloadService { ...@@ -254,35 +257,9 @@ public class ProWorkloadServiceImpl implements ProWorkloadService {
proWorkloadDao.editProWorkloadMation(map); proWorkloadDao.editProWorkloadMation(map);
proWorkloadDao.deleteProWorkloadRelatedTasksById(map); proWorkloadDao.deleteProWorkloadRelatedTasksById(map);
proWorkloadDao.insertProWorkloadRelatedTasksMation(entitys); proWorkloadDao.insertProWorkloadRelatedTasksMation(entitys);
// 判断是否提交审批 // 操作工作流数据
if("2".equals(map.get("subType").toString())){ activitiUserService.addOrEditToSubmit(inputObject, outputObject, Integer.parseInt(map.get("subType").toString()),
// 提交审批 PRO_WORKLOAD_PAGE_KEY, workloadId, map.get("approvalId").toString());
ActivitiRunFactory.run(inputObject, outputObject, PRO_WORKLOAD_PAGE_KEY).submitToActivi(workloadId, ActivitiConstants.APPROVAL_ID);
}
}
/**
*
* @Title: editProWorkloadMationInProcess
* @Description: 在工作流中编辑工作量信息
* @param inputObject
* @param outputObject
* @throws Exception 参数
* @return void 返回类型
* @throws
*/
@Override
public void editProWorkloadMationInProcess(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> map = inputObject.getParams();
String workloadId = map.get("id").toString();//工作量主表id
// 处理数据
List<Map<String, Object>> entitys = getWorkloadTaskList(outputObject, map.get("workloadTaskStr").toString(), workloadId);
if (entitys == null) return;
proWorkloadDao.editProWorkloadMation(map);
proWorkloadDao.deleteProWorkloadRelatedTasksById(map);
proWorkloadDao.insertProWorkloadRelatedTasksMation(entitys);
// 编辑流程表参数
ActivitiRunFactory.run(inputObject, outputObject, PRO_WORKLOAD_PAGE_KEY).editApplyMationInActiviti(workloadId);
} }
/** /**
......
skyeye-pro/src/main/resources/mapper/pro/ProCostExpenseMapper.xml
浏览文件 @ 7b84eeb8
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
IF((a.state = 0 OR a.state = 1 OR a.state = 12 OR a.state = 3), 1, -1) editRow, IF((a.state = 0 OR a.state = 1 OR a.state = 12 OR a.state = 3), 1, -1) editRow,
DATE_FORMAT(a.reimbursement_time, '%Y-%m-%d') reimbursementTime, DATE_FORMAT(a.reimbursement_time, '%Y-%m-%d') reimbursementTime,
FORMAT(a.all_price, 2) allPrice, FORMAT(a.all_price, 2) allPrice,
g.title taskTpye g.title taskType
FROM FROM
pro_cost_expense a pro_cost_expense a
LEFT JOIN pro_cost_expense_process b ON a.id = b.expense_id LEFT JOIN pro_cost_expense_process b ON a.id = b.expense_id
......
skyeye-pro/src/main/resources/mapper/pro/ProFileMapper.xml
浏览文件 @ 7b84eeb8
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
act_model g act_model g
WHERE a.create_id = #{userId} WHERE a.create_id = #{userId}
AND a.pro_id = c.id AND a.pro_id = c.id
AND g.page_url = '../../tpl/profile/profileadd.html' AND g.page_url = #{pageUrl}
<if test="state != '' and state != null"> <if test="state != '' and state != null">
AND a.state = #{state} AND a.state = #{state}
</if> </if>
...@@ -212,7 +212,7 @@ ...@@ -212,7 +212,7 @@
pro_project c, pro_project c,
act_model g act_model g
WHERE a.pro_id = c.id WHERE a.pro_id = c.id
AND g.page_url = '../../tpl/profile/profileadd.html' AND g.page_url = #{pageUrl}
<if test="state != '' and state != null"> <if test="state != '' and state != null">
AND a.state = #{state} AND a.state = #{state}
</if> </if>
......
skyeye-pro/src/main/resources/mapper/pro/ProProjectMapper.xml
浏览文件 @ 7b84eeb8
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
GROUP_CONCAT(distinct g.user_name) projectSponsorName, GROUP_CONCAT(distinct g.user_name) projectSponsorName,
GROUP_CONCAT(distinct h.user_name) projectMembersName, GROUP_CONCAT(distinct h.user_name) projectMembersName,
e.user_name createName, e.user_name createName,
d.`name` typeName d.`name` typeName,
k.title taskType
FROM FROM
pro_project a pro_project a
LEFT JOIN pro_project_process c ON c.pro_id = a.id LEFT JOIN pro_project_process c ON c.pro_id = a.id
...@@ -29,6 +30,7 @@ ...@@ -29,6 +30,7 @@
LEFT JOIN sys_eve_user_staff f ON INSTR(CONCAT(',', a.project_manager, ','),CONCAT(',', f.user_id, ',')) LEFT JOIN sys_eve_user_staff f ON INSTR(CONCAT(',', a.project_manager, ','),CONCAT(',', f.user_id, ','))
LEFT JOIN sys_eve_user_staff g ON INSTR(CONCAT(',', a.project_sponsor, ','),CONCAT(',', g.user_id, ',')) LEFT JOIN sys_eve_user_staff g ON INSTR(CONCAT(',', a.project_sponsor, ','),CONCAT(',', g.user_id, ','))
LEFT JOIN sys_eve_user_staff h ON INSTR(CONCAT(',', a.project_members, ','),CONCAT(',', h.user_id, ',')) LEFT JOIN sys_eve_user_staff h ON INSTR(CONCAT(',', a.project_members, ','),CONCAT(',', h.user_id, ','))
LEFT JOIN act_model k ON k.page_url = #{pageUrl}
WHERE 1 = 1 WHERE 1 = 1
<if test="typeId != '' and typeId != null"> <if test="typeId != '' and typeId != null">
AND a.type_id = #{typeId} AND a.type_id = #{typeId}
...@@ -68,7 +70,8 @@ ...@@ -68,7 +70,8 @@
a.project_content projectContent, a.project_content projectContent,
d.`name` typeName, d.`name` typeName,
<!-- 默认可编辑 --> <!-- 默认可编辑 -->
IF((a.state = 0 OR a.state = 1 OR a.state = 5), 1, -1) editRow IF((a.state = 0 OR a.state = 1 OR a.state = 5), 1, -1) editRow,
k.title taskType
FROM FROM
pro_project a pro_project a
LEFT JOIN pro_project_process c ON c.pro_id = a.id LEFT JOIN pro_project_process c ON c.pro_id = a.id
...@@ -77,6 +80,7 @@ ...@@ -77,6 +80,7 @@
LEFT JOIN sys_eve_user_staff f ON INSTR(CONCAT(',', a.project_manager, ','),CONCAT(',', f.user_id, ',')) LEFT JOIN sys_eve_user_staff f ON INSTR(CONCAT(',', a.project_manager, ','),CONCAT(',', f.user_id, ','))
LEFT JOIN sys_eve_user_staff g ON INSTR(CONCAT(',', a.project_sponsor, ','),CONCAT(',', g.user_id, ',')) LEFT JOIN sys_eve_user_staff g ON INSTR(CONCAT(',', a.project_sponsor, ','),CONCAT(',', g.user_id, ','))
LEFT JOIN sys_eve_user_staff h ON INSTR(CONCAT(',', a.project_members, ','),CONCAT(',', h.user_id, ',')) LEFT JOIN sys_eve_user_staff h ON INSTR(CONCAT(',', a.project_members, ','),CONCAT(',', h.user_id, ','))
LEFT JOIN act_model k ON k.page_url = #{pageUrl}
WHERE CASE WHEN a.create_id = #{userId} THEN 1 = 1 ELSE a.state IN(2, 3, 4) END WHERE CASE WHEN a.create_id = #{userId} THEN 1 = 1 ELSE a.state IN(2, 3, 4) END
<if test="typeId != '' and typeId != null"> <if test="typeId != '' and typeId != null">
AND a.type_id = #{typeId} AND a.type_id = #{typeId}
...@@ -216,7 +220,7 @@ ...@@ -216,7 +220,7 @@
a.estimated_cost estimatedCost, a.estimated_cost estimatedCost,
a.business_content businessContent, a.business_content businessContent,
IFNULL(a.business_enclosure_info, '') businessEnclosureInfo, IFNULL(a.business_enclosure_info, '') businessEnclosureInfo,
c.process_instance_id processInstanceId, IFNULL(c.process_instance_id, '') processInstanceId,
a.state, a.state,
<!-- 默认可编辑 --> <!-- 默认可编辑 -->
IF((a.state = 0 OR a.state = 1 OR a.state = 5), 1, -1) editRow IF((a.state = 0 OR a.state = 1 OR a.state = 5), 1, -1) editRow
......
skyeye-pro/src/main/resources/reqmapping/mapping/pro.xml
浏览文件 @ 7b84eeb8
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
<property id="businessContent" name="businessContent" ref="required" var="业务需求和目标"/> <property id="businessContent" name="businessContent" ref="required" var="业务需求和目标"/>
<property id="businessEnclosureInfo" name="businessEnclosureInfo" ref="" var="附件"/> <property id="businessEnclosureInfo" name="businessEnclosureInfo" ref="" var="附件"/>
<property id="subType" name="subType" ref="required" var="提交类型"/> <property id="subType" name="subType" ref="required" var="提交类型"/>
<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
</url> </url>
<url id="proproject004" path="/post/ProProjectController/queryAllProProjectToChoose" val="获取所有指定项目用于下拉框选择" allUse="2"> <url id="proproject004" path="/post/ProProjectController/queryAllProProjectToChoose" val="获取所有指定项目用于下拉框选择" allUse="2">
</url> </url>
...@@ -68,9 +69,11 @@ ...@@ -68,9 +69,11 @@
<property id="businessContent" name="businessContent" ref="required" var="业务需求和目标"/> <property id="businessContent" name="businessContent" ref="required" var="业务需求和目标"/>
<property id="businessEnclosureInfo" name="businessEnclosureInfo" ref="" var="附件"/> <property id="businessEnclosureInfo" name="businessEnclosureInfo" ref="" var="附件"/>
<property id="subType" name="subType" ref="required" var="提交类型"/> <property id="subType" name="subType" ref="required" var="提交类型"/>
<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
</url> </url>
<url id="proproject008" path="/post/ProProjectController/editProProjectMationToSubApproval" val="项目提交审批" allUse="2"> <url id="proproject008" path="/post/ProProjectController/editProProjectMationToSubApproval" val="项目提交审批" allUse="2">
<property id="rowId" name="id" ref="required" var="项目id"/> <property id="rowId" name="id" ref="required" var="项目id"/>
<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
</url> </url>
<url id="proproject009" path="/post/ProProjectController/deleteProProjectMationById" val="删除项目" allUse="1"> <url id="proproject009" path="/post/ProProjectController/deleteProProjectMationById" val="删除项目" allUse="1">
<property id="rowId" name="id" ref="required" var="项目id"/> <property id="rowId" name="id" ref="required" var="项目id"/>
...@@ -108,26 +111,6 @@ ...@@ -108,26 +111,6 @@
<property id="resultsContent" name="resultsContent" ref="required" var="成果与总结"/> <property id="resultsContent" name="resultsContent" ref="required" var="成果与总结"/>
<property id="subType" name="subType" ref="required,num" var="操作保存类型：1.保存，2.完结"/> <property id="subType" name="subType" ref="required,num" var="操作保存类型：1.保存，2.完结"/>
</url> </url>
<url id="proproject017" path="/post/ProProjectController/editProjectMationInProcess" val="在工作流中编辑项目信息" allUse="2">
<property id="rowId" name="id" ref="required" var="项目id"/>
<property id="projectName" name="projectName" ref="required" var="项目名称"/>
<property id="projectNumber" name="projectNumber" ref="" var="项目编号"/>
<property id="typeId" name="typeId" ref="required" var="项目分类"/>
<property id="startTime" name="startTime" ref="required" var="计划开始时间"/>
<property id="endTime" name="endTime" ref="required" var="计划完成时间"/>
<property id="customerId" name="customerId" ref="" var="客户名称"/>
<property id="contractId" name="contractId" ref="" var="关联合同"/>
<property id="contactName" name="contactName" ref="" var="对方联系人"/>
<property id="telphone" name="telphone" ref="" var="固定电话"/>
<property id="mobile" name="mobile" ref="" var="移动电话"/>
<property id="mail" name="mail" ref="" var="邮箱"/>
<property id="qq" name="qq" ref="" var="qq"/>
<property id="departmentId" name="departmentId" ref="" var="所属部门"/>
<property id="estimatedWorkload" name="estimatedWorkload" ref="" var="预估工作量"/>
<property id="estimatedCost" name="estimatedCost" ref="" var="预估成本费用"/>
<property id="businessContent" name="businessContent" ref="required" var="业务需求和目标"/>
<property id="businessEnclosureInfo" name="businessEnclosureInfo" ref="" var="附件"/>
</url>
<!-- 项目管理结束 --> <!-- 项目管理结束 -->
<!-- 项目工作量开始 --> <!-- 项目工作量开始 -->
...@@ -148,6 +131,7 @@ ...@@ -148,6 +131,7 @@
<property id="workloadTaskStr" name="workloadTaskStr" ref="required,json" var="工作量相关任务json串" /> <property id="workloadTaskStr" name="workloadTaskStr" ref="required,json" var="工作量相关任务json串" />
<property id="enclosureInfo" name="enclosureInfo" ref="" var="附件" /> <property id="enclosureInfo" name="enclosureInfo" ref="" var="附件" />
<property id="subType" name="subType" ref="required,num" var="表单提交类型" /> <property id="subType" name="subType" ref="required,num" var="表单提交类型" />
<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
</url> </url>
<url id="proworkload003" path="/post/ProWorkloadController/queryAllProWorkloadList" val="获取所有的工作量列表" allUse="1"> <url id="proworkload003" path="/post/ProWorkloadController/queryAllProWorkloadList" val="获取所有的工作量列表" allUse="1">
<property id="limit" name="limit" ref="required,num" var="分页参数,每页多少条数据" /> <property id="limit" name="limit" ref="required,num" var="分页参数,每页多少条数据" />
...@@ -158,6 +142,7 @@ ...@@ -158,6 +142,7 @@
</url> </url>
<url id="proworkload004" path="/post/ProWorkloadController/editProWorkloadToApprovalById" val="提交审批" allUse="1"> <url id="proworkload004" path="/post/ProWorkloadController/editProWorkloadToApprovalById" val="提交审批" allUse="1">
<property id="rowId" name="id" ref="required" var="工作量id"/> <property id="rowId" name="id" ref="required" var="工作量id"/>
<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
</url> </url>
<url id="proworkload005" path="/post/ProWorkloadController/editProWorkloadProcessToRevoke" val="撤销工作量审批申请" allUse="1"> <url id="proworkload005" path="/post/ProWorkloadController/editProWorkloadProcessToRevoke" val="撤销工作量审批申请" allUse="1">
<property id="processInstanceId" name="processInstanceId" ref="required" var="工作流程Id" /> <property id="processInstanceId" name="processInstanceId" ref="required" var="工作流程Id" />
...@@ -179,17 +164,7 @@ ...@@ -179,17 +164,7 @@
<property id="workloadTaskStr" name="workloadTaskStr" ref="required,json" var="工作量相关任务json串" /> <property id="workloadTaskStr" name="workloadTaskStr" ref="required,json" var="工作量相关任务json串" />
<property id="enclosureInfo" name="enclosureInfo" ref="" var="附件" /> <property id="enclosureInfo" name="enclosureInfo" ref="" var="附件" />
<property id="subType" name="subType" ref="required,num" var="表单提交类型" /> <property id="subType" name="subType" ref="required,num" var="表单提交类型" />
</url> <property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
<url id="proworkload009" path="/post/ProWorkloadController/editProWorkloadMationInProcess" val="在工作流中编辑工作量信息" allUse="2">
<property id="rowId" name="id" ref="required" var="工作量Id" />
<property id="title" name="title" ref="required" var="工作量名称" />
<property id="proId" name="proId" ref="required" var="项目Id" />
<property id="projectNumber" name="projectNumber" ref="" var="项目编号" />
<property id="desc" name="desc" ref="" var="附加描述" />
<property id="type" name="type" ref="required" var="填报工作量节点" />
<property id="allWorkLoad" name="allWorkLoad" ref="required" var="本周合计工作量" />
<property id="workloadTaskStr" name="workloadTaskStr" ref="required,json" var="工作量相关任务json串" />
<property id="enclosureInfo" name="enclosureInfo" ref="" var="附件" />
</url> </url>
<url id="proworkload010" path="/post/ProWorkloadController/deleteProWorkloadMationById" val="删除工作量" allUse="1"> <url id="proworkload010" path="/post/ProWorkloadController/deleteProWorkloadMationById" val="删除工作量" allUse="1">
<property id="rowId" name="id" ref="required" var="工作量Id" /> <property id="rowId" name="id" ref="required" var="工作量Id" />
...@@ -245,6 +220,7 @@ ...@@ -245,6 +220,7 @@
<property id="content" name="content" ref="required" var="文档内容"/> <property id="content" name="content" ref="required" var="文档内容"/>
<property id="enclosureInfo" name="enclosureInfo" ref="" var="附件"/> <property id="enclosureInfo" name="enclosureInfo" ref="" var="附件"/>
<property id="subType" name="subType" ref="required,num" var="表单提交类型" /> <property id="subType" name="subType" ref="required,num" var="表单提交类型" />
<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
</url> </url>
<url id="profile003" path="/post/ProFileController/queryProFileMationToDetails" val="文档详情" allUse="2"> <url id="profile003" path="/post/ProFileController/queryProFileMationToDetails" val="文档详情" allUse="2">
<property id="rowId" name="id" ref="required" var="文档Id" /> <property id="rowId" name="id" ref="required" var="文档Id" />
...@@ -260,21 +236,15 @@ ...@@ -260,21 +236,15 @@
<property id="content" name="content" ref="required" var="文档内容"/> <property id="content" name="content" ref="required" var="文档内容"/>
<property id="enclosureInfo" name="enclosureInfo" ref="" var="附件"/> <property id="enclosureInfo" name="enclosureInfo" ref="" var="附件"/>
<property id="subType" name="subType" ref="required,num" var="表单提交类型" /> <property id="subType" name="subType" ref="required,num" var="表单提交类型" />
<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
</url> </url>
<url id="profile006" path="/post/ProFileController/editProFileToApprovalById" val="提交审批" allUse="1"> <url id="profile006" path="/post/ProFileController/editProFileToApprovalById" val="提交审批" allUse="1">
<property id="rowId" name="id" ref="required" var="文档id"/> <property id="rowId" name="id" ref="required" var="文档id"/>
<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
</url> </url>
<url id="profile007" path="/post/ProFileController/editProFileProcessToRevoke" val="撤销文档审批申请" allUse="1"> <url id="profile007" path="/post/ProFileController/editProFileProcessToRevoke" val="撤销文档审批申请" allUse="1">
<property id="processInstanceId" name="processInstanceId" ref="required" var="工作流程Id" /> <property id="processInstanceId" name="processInstanceId" ref="required" var="工作流程Id" />
</url> </url>
<url id="profile008" path="/post/ProFileController/editProFileMationInProcess" val="在工作流中编辑文档信息" allUse="2">
<property id="rowId" name="id" ref="required" var="文档Id" />
<property id="proId" name="proId" ref="required" var="项目id"/>
<property id="typeId" name="typeId" ref="required" var="所属分类id"/>
<property id="title" name="title" ref="required" var="文档名称"/>
<property id="content" name="content" ref="required" var="文档内容"/>
<property id="enclosureInfo" name="enclosureInfo" ref="" var="附件"/>
</url>
<url id="profile009" path="/post/ProFileController/deleteProFileMationById" val="删除文档" allUse="1"> <url id="profile009" path="/post/ProFileController/deleteProFileMationById" val="删除文档" allUse="1">
<property id="rowId" name="id" ref="required" var="文档Id" /> <property id="rowId" name="id" ref="required" var="文档Id" />
</url> </url>
...@@ -311,6 +281,7 @@ ...@@ -311,6 +281,7 @@
<property id="enclosureInfo" name="enclosureInfo" ref="" var="附件"/> <property id="enclosureInfo" name="enclosureInfo" ref="" var="附件"/>
<property id="expensePurposeStr" name="expensePurposeStr" ref="required" var="成本费用用途详细json串" /> <property id="expensePurposeStr" name="expensePurposeStr" ref="required" var="成本费用用途详细json串" />
<property id="subType" name="subType" ref="required,num" var="表单提交类型" /> <property id="subType" name="subType" ref="required,num" var="表单提交类型" />
<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
</url> </url>
<url id="procostexpense003" path="/post/ProCostExpenseController/queryProCostExpenseMationToDetails" val="费用报销详情" allUse="2"> <url id="procostexpense003" path="/post/ProCostExpenseController/queryProCostExpenseMationToDetails" val="费用报销详情" allUse="2">
<property id="rowId" name="id" ref="required" var="费用报销Id" /> <property id="rowId" name="id" ref="required" var="费用报销Id" />
...@@ -327,22 +298,15 @@ ...@@ -327,22 +298,15 @@
<property id="enclosureInfo" name="enclosureInfo" ref="" var="附件"/> <property id="enclosureInfo" name="enclosureInfo" ref="" var="附件"/>
<property id="expensePurposeStr" name="expensePurposeStr" ref="required" var="成本费用用途详细json串" /> <property id="expensePurposeStr" name="expensePurposeStr" ref="required" var="成本费用用途详细json串" />
<property id="subType" name="subType" ref="required,num" var="表单提交类型" /> <property id="subType" name="subType" ref="required,num" var="表单提交类型" />
<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
</url> </url>
<url id="procostexpense006" path="/post/ProCostExpenseController/editProCostExpenseToApprovalById" val="提交审批" allUse="2"> <url id="procostexpense006" path="/post/ProCostExpenseController/editProCostExpenseToApprovalById" val="提交审批" allUse="2">
<property id="rowId" name="id" ref="required" var="费用报销id"/> <property id="rowId" name="id" ref="required" var="费用报销id"/>
<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
</url> </url>
<url id="procostexpense007" path="/post/ProCostExpenseController/editProCostExpenseProcessToRevoke" val="撤销费用报销审批申请" allUse="2"> <url id="procostexpense007" path="/post/ProCostExpenseController/editProCostExpenseProcessToRevoke" val="撤销费用报销审批申请" allUse="2">
<property id="processInstanceId" name="processInstanceId" ref="required" var="工作流程Id" /> <property id="processInstanceId" name="processInstanceId" ref="required" var="工作流程Id" />
</url> </url>
<url id="procostexpense008" path="/post/ProCostExpenseController/editProCostExpenseMationInProcess" val="在工作流中编辑费用报销信息" allUse="2">
<property id="rowId" name="id" ref="required" var="费用报销Id" />
<property id="proId" name="proId" ref="required" var="项目id"/>
<property id="departmentId" name="departmentId" ref="required" var="所属部门id"/>
<property id="title" name="title" ref="required" var="费用报销名称"/>
<property id="reimbursementTime" name="reimbursementTime" ref="required" var="报销时间"/>
<property id="enclosureInfo" name="enclosureInfo" ref="" var="附件"/>
<property id="expensePurposeStr" name="expensePurposeStr" ref="required" var="成本费用用途详细json串" />
</url>
<url id="procostexpense009" path="/post/ProCostExpenseController/deleteProCostExpenseMationById" val="删除费用报销" allUse="2"> <url id="procostexpense009" path="/post/ProCostExpenseController/deleteProCostExpenseMationById" val="删除费用报销" allUse="2">
<property id="rowId" name="id" ref="required" var="费用报销Id" /> <property id="rowId" name="id" ref="required" var="费用报销Id" />
</url> </url>
...@@ -372,6 +336,7 @@ ...@@ -372,6 +336,7 @@
<property id="enclosureInfo" name="enclosureInfo" ref="" var="任务说明附件"/> <property id="enclosureInfo" name="enclosureInfo" ref="" var="任务说明附件"/>
<property id="parentId" name="parentId" ref="required" var="所属主任务"/> <property id="parentId" name="parentId" ref="required" var="所属主任务"/>
<property id="subType" name="subType" ref="required,num" var="表单提交类型" /> <property id="subType" name="subType" ref="required,num" var="表单提交类型" />
<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
</url> </url>
<url id="protask003" path="/post/ProTaskController/queryProTaskMationToDetails" val="任务详情" allUse="2"> <url id="protask003" path="/post/ProTaskController/queryProTaskMationToDetails" val="任务详情" allUse="2">
<property id="rowId" name="id" ref="required" var="任务Id" /> <property id="rowId" name="id" ref="required" var="任务Id" />
...@@ -392,6 +357,7 @@ ...@@ -392,6 +357,7 @@
<property id="taskInstructions" name="taskInstructions" ref="required" var="任务说明"/> <property id="taskInstructions" name="taskInstructions" ref="required" var="任务说明"/>
<property id="enclosureInfo" name="enclosureInfo" ref="" var="任务说明附件"/> <property id="enclosureInfo" name="enclosureInfo" ref="" var="任务说明附件"/>
<property id="subType" name="subType" ref="required,num" var="表单提交类型" /> <property id="subType" name="subType" ref="required,num" var="表单提交类型" />
<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
</url> </url>
<url id="protask006" path="/post/ProTaskController/deleteProTaskMationById" val="删除任务" allUse="1"> <url id="protask006" path="/post/ProTaskController/deleteProTaskMationById" val="删除任务" allUse="1">
<property id="rowId" name="id" ref="required" var="任务Id" /> <property id="rowId" name="id" ref="required" var="任务Id" />
...@@ -401,23 +367,11 @@ ...@@ -401,23 +367,11 @@
</url> </url>
<url id="protask008" path="/post/ProTaskController/editProTaskToApprovalById" val="根据任务Id提交审批" allUse="1"> <url id="protask008" path="/post/ProTaskController/editProTaskToApprovalById" val="根据任务Id提交审批" allUse="1">
<property id="rowId" name="id" ref="required" var="任务id"/> <property id="rowId" name="id" ref="required" var="任务id"/>
<property id="approvalId" name="approvalId" ref="" var="[提交审批]操作必填审批人" />
</url> </url>
<url id="protask009" path="/post/ProTaskController/updateProTaskToCancellation" val="作废任务" allUse="1"> <url id="protask009" path="/post/ProTaskController/updateProTaskToCancellation" val="作废任务" allUse="1">
<property id="rowId" name="id" ref="required" var="任务id"/> <property id="rowId" name="id" ref="required" var="任务id"/>
</url> </url>
<url id="protask010" path="/post/ProTaskController/editProTaskMationInProcess" val="在工作流中编辑任务信息" allUse="2">
<property id="rowId" name="id" ref="required" var="任务Id" />
<property id="taskName" name="taskName" ref="required" var="任务名称"/>
<property id="taskType" name="taskType" ref="required" var="任务分类"/>
<property id="proId" name="proId" ref="required" var="所属项目"/>
<property id="departments" name="departments" ref="required" var="所属部门"/>
<property id="startTime" name="startTime" ref="required" var="开始时间"/>
<property id="endTime" name="endTime" ref="" var="结束时间"/>
<property id="performId" name="performId" ref="required" var="执行人"/>
<property id="estimatedWorkload" name="estimatedWorkload" ref="required,num" var="预估工作量"/>
<property id="taskInstructions" name="taskInstructions" ref="required" var="任务说明"/>
<property id="enclosureInfo" name="enclosureInfo" ref="" var="任务说明附件"/>
</url>
<url id="protask011" path="/post/ProTaskController/queryMyProTaskList" val="获取我的任务列表" allUse="1"> <url id="protask011" path="/post/ProTaskController/queryMyProTaskList" val="获取我的任务列表" allUse="1">
<property id="taskName" name="taskName" ref="" var="任务名称"/> <property id="taskName" name="taskName" ref="" var="任务名称"/>
<property id="myRole" name="myRole" ref="" var="我的任务"/> <property id="myRole" name="myRole" ref="" var="我的任务"/>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或