Commit 0547449e by 焦凯

提交合同提醒修改的代码

parent 1bf6a4ae
......@@ -17,6 +17,7 @@ import com.xyst.dinas.contract.internal.scene.ContractListDefaultScene;
import com.xyst.dinas.contract.internal.service.ContractServiceImpl;
import com.xyst.dinas.contract.internal.service.ContractWarnServiceImpl;
import com.xyst.dinas.contract.listener.ContractProcessEventListener;
import com.xyst.dinas.contract.listener.ContractTaskEventListenerHandle;
import com.xyst.dinas.contract.listener.ContractUpdateProcessListener;
import com.xyst.dinas.contract.query.processor.ContractDetailProcessor;
import com.xyst.dinas.contract.query.processor.ContractInfoProcessor;
......@@ -155,6 +156,10 @@ public class ContractConfiguration {
public ContractExpireCheckTask contractExpireCheckTask() {
return new ContractExpireCheckTask();
}
@Bean
public ContractTaskEventListenerHandle contractTaskEventListenerHandle() {
return new ContractTaskEventListenerHandle();
}
@Bean("com.xyst.dinas.contract.warn.DinasCountWarningCalculator")
......
......@@ -473,7 +473,7 @@ public class ContractServiceImpl implements ContractService {
try {
UUID contractId = contractKObj.getUuid(CommonConstants.ID);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
JSONObject remObject = new JSONObject();
remObject.put(RemindConstants.CREATE_TIME, format.format(new Date()));
......@@ -482,16 +482,16 @@ public class ContractServiceImpl implements ContractService {
}else if(result.equals("reject")){
remObject.put(RemindConstants.REMIND_CONTENT, contractKObj.getString(ContractConstant.CONTRACT_NAME)+"审核不通过,请处理!");
}
remObject.put(RemindConstants.REMIND_TIME, format.format(new Date()));
remObject.put(RemindConstants.REMIND_TIME, (new Date()).getTime());
remObject.put(RemindConstants.DATA, contractId);
remObject.put(RemindConstants.LOOK_NAME, "合同审核提醒");
remObject.put(RemindConstants.LOOK_TYPE, "Contract");
remObject.put("_type", com.beecode.inz.message.CommonConstants.REMIND_ENTITY);
JSONObject businessInfo = new JSONObject();
// JSONObject businessInfo = new JSONObject();
// businessInfo.put("biztypeName", "company-info");
// businessInfo.put("triggerAction", "create");
businessInfo.put("bizDataId", contractId);
remObject.put("businessInfo", businessInfo);
// businessInfo.put("bizDataId", contractId);
// remObject.put("businessInfo", businessInfo);
String remindId = UUID.randomUUID().toString();
remObject.put(RemindConstants.ID, remindId);
......
......@@ -64,23 +64,23 @@ public class ContractTaskEventListenerHandle implements ApplicationListener<Cont
return;//工作流参数中没有找到提交审核的数据的id,不知道该怎么处理,先直接返回
}
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
KObject contractKObj = contractDao.load(dataId);
JSONObject remObject = new JSONObject();
remObject.put(RemindConstants.CREATE_TIME, format.format(new Date()));
remObject.put(RemindConstants.REMIND_CONTENT, contractKObj.getString(ContractConstant.CONTRACT_NAME)+"待审批,请处理!");
remObject.put(RemindConstants.REMIND_TIME, format.format(new Date()));
remObject.put(RemindConstants.REMIND_TIME, (new Date()).getTime());
remObject.put(RemindConstants.DATA, dataId);
remObject.put(RemindConstants.LOOK_NAME, "合同待审提醒");
remObject.put(RemindConstants.LOOK_TYPE, "Contract");
remObject.put("_type", CommonConstants.REMIND_ENTITY);
JSONObject businessInfo = new JSONObject();
// businessInfo.put("biztypeName", "company-info");
// businessInfo.put("triggerAction", "create");
businessInfo.put("bizDataId", dataId);
remObject.put("businessInfo", businessInfo);
// JSONObject businessInfo = new JSONObject();
// // businessInfo.put("biztypeName", "company-info");
// // businessInfo.put("triggerAction", "create");
// businessInfo.put("bizDataId", dataId);
// remObject.put("businessInfo", businessInfo);
String remindId = UUID.randomUUID().toString();
remObject.put(RemindConstants.ID, remindId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment