|
@@ -1,6 +1,5 @@
|
|
|
package com.goafanti.weChat.service.impl;
|
|
package com.goafanti.weChat.service.impl;
|
|
|
|
|
|
|
|
-import java.math.BigDecimal;
|
|
|
|
|
import java.text.ParseException;
|
|
import java.text.ParseException;
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
|
|
|
|
|
@@ -10,7 +9,6 @@ import com.goafanti.common.model.*;
|
|
|
import com.goafanti.weChat.bo.*;
|
|
import com.goafanti.weChat.bo.*;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.cache.annotation.Cacheable;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.web.socket.TextMessage;
|
|
import org.springframework.web.socket.TextMessage;
|
|
|
|
|
|
|
@@ -153,7 +151,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
String str="["+my.getName()+"]发起["+nickname+"]的外出申请,请及时审核。";
|
|
String str="["+my.getName()+"]发起["+nickname+"]的外出申请,请及时审核。";
|
|
|
sendNoticeAndSoucket(a.getId(),1,str);
|
|
sendNoticeAndSoucket(a.getId(),1,str);
|
|
|
Map<String, Object>map=new HashMap<String, Object>();
|
|
Map<String, Object>map=new HashMap<String, Object>();
|
|
|
- map.put("data", publicReleaseMapper.selectDtails(in.getId(),null));
|
|
|
|
|
|
|
+ map.put("data", publicReleaseMapper.selectDtails(in.getId()));
|
|
|
if (openid!=null) {
|
|
if (openid!=null) {
|
|
|
Integer res= weChatUtils.addNotice(openid, in.getStatus(),in.getId(),date,my.getName(),"["+my.getName()+"]发起外出申请");
|
|
Integer res= weChatUtils.addNotice(openid, in.getStatus(),in.getId(),date,my.getName(),"["+my.getName()+"]发起外出申请");
|
|
|
if (res!=0) {
|
|
if (res!=0) {
|
|
@@ -678,7 +676,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
@Override
|
|
@Override
|
|
|
public OutPublicRelease dtails(Integer id) {
|
|
public OutPublicRelease dtails(Integer id) {
|
|
|
//如果不是本人和审核人员则不返回信息
|
|
//如果不是本人和审核人员则不返回信息
|
|
|
- OutPublicRelease out=publicReleaseMapper.selectDtails(id,null);
|
|
|
|
|
|
|
+ OutPublicRelease out=publicReleaseMapper.selectDtails(id);
|
|
|
if(out!=null){
|
|
if(out!=null){
|
|
|
boolean flag=false;
|
|
boolean flag=false;
|
|
|
//自己、审核人员与部门负责人可以查看
|
|
//自己、审核人员与部门负责人可以查看
|
|
@@ -706,9 +704,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
- public OutPublicRelease followDtails(String id) {
|
|
|
|
|
- OutPublicRelease out = publicReleaseMapper.selectDtails(null, id);
|
|
|
|
|
- out.setPrdList(publicReleaseDetailsMapper.selectByPCid(out.getId()));
|
|
|
|
|
|
|
+ public OutPublicReleaseAndDetails followDtails(String id) {
|
|
|
|
|
+ OutPublicReleaseAndDetails out = publicReleaseMapper.selectDtailsByFid( id);
|
|
|
return out;
|
|
return out;
|
|
|
}
|
|
}
|
|
|
|
|
|