| @@ -151,7 +151,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| List<MallUserInfo> mallUserInfoList = getUserByProcessInstanceId(processInstance.getId()); | List<MallUserInfo> mallUserInfoList = getUserByProcessInstanceId(processInstance.getId()); | ||||
| for (MallUserInfo mallUserInfo:mallUserInfoList) { | for (MallUserInfo mallUserInfo:mallUserInfoList) { | ||||
| Map<String,String> content = new HashedMap(); | Map<String,String> content = new HashedMap(); | ||||
| content.put("userName",mallUserInfo.getName()); | |||||
| content.put("userName",starterInfo.getName()); | |||||
| content.put("page", Constant.adminPage); | content.put("page", Constant.adminPage); | ||||
| content.put("modelName","代办通知"); | content.put("modelName","代办通知"); | ||||
| @@ -503,7 +503,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| public void download(HttpServletRequest request, HttpServletResponse response, String tenantId) { | public void download(HttpServletRequest request, HttpServletResponse response, String tenantId) { | ||||
| String id = request.getParameter("id"); | String id = request.getParameter("id"); | ||||
| WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(id); | WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(id); | ||||
| logger.info("----------id:{},getFilename:{}",id,wxRentContract.getFilename()); | |||||
| String filesuffix = wxRentContract.getFilepath().substring(wxRentContract.getFilepath().lastIndexOf(".")); | String filesuffix = wxRentContract.getFilepath().substring(wxRentContract.getFilepath().lastIndexOf(".")); | ||||
| String filename = UUID.randomUUID() + filesuffix; | String filename = UUID.randomUUID() + filesuffix; | ||||
| String filepath = Constant.fileDirectory; | String filepath = Constant.fileDirectory; | ||||
| @@ -10,7 +10,7 @@ | |||||
| <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | ||||
| <result column="cmd_json" jdbcType="VARCHAR" property="cmdJson"/> | <result column="cmd_json" jdbcType="VARCHAR" property="cmdJson"/> | ||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`tenant_id`,`vendor_type`,`cmd_type`,`create_date`,`update_date`,`cmd_json` | `id`,`tenant_id`,`vendor_type`,`cmd_type`,`create_date`,`update_date`,`cmd_json` | ||||
| </sql> | </sql> | ||||
| @@ -101,7 +101,7 @@ | |||||
| f.floor_name floorName,b.building_name buildingName,receive_period receivePeriod, | f.floor_name floorName,b.building_name buildingName,receive_period receivePeriod, | ||||
| rc.lease,rc.filepath,rc.filename,rc.pay_account payAccount,rc.sign_date signDate, | rc.lease,rc.filepath,rc.filename,rc.pay_account payAccount,rc.sign_date signDate, | ||||
| start_date startDate,end_date endDate,rc.rent_contract_id rentContractId,br.`name` brandName, | start_date startDate,end_date endDate,rc.rent_contract_id rentContractId,br.`name` brandName, | ||||
| s.addr | |||||
| s.addr,rc.apply_status | |||||
| from wx_property_contract rc | from wx_property_contract rc | ||||
| left join wx_shop s on rc.shop_id=s.id | left join wx_shop s on rc.shop_id=s.id | ||||
| left join wx_mall_floor f on s.floor=f.id | left join wx_mall_floor f on s.floor=f.id | ||||