diff --git a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java index a8a468f57..c477b1205 100644 --- a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java @@ -237,7 +237,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ String userId = fieldMap.get("userid") == null ? "" : fieldMap.get("userid").toString(); String sign = fieldMap.get("sign") == null ? "" : fieldMap.get("sign").toString(); - String sql = "SELECT lul.customer_name,cp.mobile,cp.SEX,cp.WORKCORP,cp.WORKADD,ca.fulladdress,cp.EMERGENCY_CONTACT_PERSON,lrp.contract_id,cp.customerid AS customer_id FROM lc_overdue_rent_plan lrp LEFT JOIN lb_contract_info lci ON lci.id=lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.CONTRACT_ID = lrp.CONTRACT_ID LEFT JOIN CUSTOMER_PERSON cp ON cp.customerid = lul.CUSTOMER_ID LEFT JOIN CUSTOMER_ADDRESS ca ON ca.customerid = cp.customerid WHERE lrp.plan_date < NOW() AND lrp.plan_status='未结清' "; + String sql = "SELECT lrp.PROJECT_PLAN_NUMBER,lul.customer_name,cp.mobile,cp.SEX,cp.WORKCORP,cp.WORKADD,ca.fulladdress,cp.EMERGENCY_CONTACT_PERSON,lrp.contract_id,cp.customerid AS customer_id FROM lc_overdue_rent_plan lrp LEFT JOIN lb_contract_info lci ON lci.id=lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.CONTRACT_ID = lrp.CONTRACT_ID LEFT JOIN CUSTOMER_PERSON cp ON cp.customerid = lul.CUSTOMER_ID LEFT JOIN CUSTOMER_ADDRESS ca ON ca.customerid = cp.customerid WHERE lrp.plan_date < NOW() AND lrp.plan_status='未结清' "; if("my".equalsIgnoreCase(sign)){ System.out.println("获取我的逾期提醒数据 "); sql = sql + " AND lci.project_manage='"+userId+"' GROUP BY lrp.contract_id "; diff --git a/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/controller/ApplyChangeController.java b/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/controller/ApplyChangeController.java index c39f54c06..6e169ce53 100644 --- a/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/controller/ApplyChangeController.java +++ b/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/controller/ApplyChangeController.java @@ -512,7 +512,8 @@ public class ApplyChangeController { return ReturnMapUtil.rollback(e); } } - //获取逾期合同信息数据 + + //获取租金计划列表信息数据 @Path("/get/plan") @POST public Map Getpaln(@Context HttpServletRequest request, diff --git a/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/service/impl/AppUndoServiceServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/service/impl/AppUndoServiceServiceImpl.java index 113165980..331902719 100644 --- a/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/service/impl/AppUndoServiceServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/service/impl/AppUndoServiceServiceImpl.java @@ -65,6 +65,12 @@ public class AppUndoServiceServiceImpl implements AppUndoService { "flowunid").toString(); String userid = fieldMap.get("userid") == null ? "" : fieldMap.get("userid").toString(); ASUser CurUser = new ASUser(userid, sqlca); + String CANCLE_RESON = fieldMap.get("CANCLE_RESON") == null ? "" : fieldMap.get("CANCLE_RESON").toString(); + Map bo = new HashMap(); + if(CANCLE_RESON == null || "".equals(CANCLE_RESON) ){ + ReturnMapUtil.setReturnMap(null,RestfullConstant.baseProperty.get("fail").toString(), "撤销说明信息不能为空!!!"); + return ReturnMapUtil.getReturnMap(); + }else{ BizObject cat = catManage.createQuery(" flowunid =:flowunid").setParameter("flowunid", flowUnid).getSingleResult(true); if(null == cat){ cat = catManage.newObject(); @@ -77,7 +83,8 @@ public class AppUndoServiceServiceImpl implements AppUndoService { cat.setAttributeValue("FLOWUNID", fieldMap.get("FLOWUNID") == null ? "" : fieldMap.get("FLOWUNID").toString()); catManage.saveObject(cat); - ReturnMapUtil.setReturnMap(null, + } + ReturnMapUtil.setReturnMap(bo, RestfullConstant.baseProperty.get("success").toString(), ""); return ReturnMapUtil.getReturnMap(); }