Administrator 4 years ago
parent
commit
d12f89d22d

+ 11 - 1
src/main/java/com/goafanti/admin/service/impl/PublicReleaseServiceImpl.java

@@ -28,6 +28,7 @@ import com.goafanti.admin.service.PublicReleaseService;
 import com.goafanti.common.bo.EmailBo;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AdminMapper;
+import com.goafanti.common.dao.OrganizationContactBookMapper;
 import com.goafanti.common.dao.PublicReleaseLogMapper;
 import com.goafanti.common.dao.PublicReleaseMapper;
 import com.goafanti.common.dao.UserMapper;
@@ -35,6 +36,7 @@ import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.Notice;
+import com.goafanti.common.model.OrganizationContactBook;
 import com.goafanti.common.model.PublicRelease;
 import com.goafanti.common.model.PublicReleaseLog;
 import com.goafanti.common.model.User;
@@ -68,6 +70,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	@Autowired
 	private	UserMapper	userMapper;
 	@Autowired
+	private OrganizationContactBookMapper	organizationContactBookMapper;
+	@Autowired
 	private SystemWebSocketHandler	systemWebSocketHandler;
 	
 	@Override
@@ -233,6 +237,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	public int pushPublicReleaseClockIn(Integer id,String photoUrl) {
 		PublicRelease p=new PublicRelease();
 		PublicRelease use=publicReleaseMapper.selectByPrimaryKey(id);
+		String aid=TokenManager.getAdminId();
 		p.setId(id);
 		p.setClockIn(1);
 		p.setPhotoUrl(photoUrl);
@@ -243,6 +248,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			fbb.setUid(use.getUid());
 			fbb.setContactType("0");
 			fbb.setResult(use.getRemarks());
+			OrganizationContactBook ub=organizationContactBookMapper.getMajor(use.getUfid(),aid);
+			if (ub !=null) {
+				fbb.setContacts(ub.getName());
+				fbb.setContactMobile(ub.getMobile());
+			}
 			fbb.setFollowTime(DateUtils.formatDate(p.getClockInTime(), AFTConstants.YYYYMMDDHHMMSS));
 			String ufid=UUID.randomUUID().toString();
 			p.setUfid(ufid);
@@ -251,7 +261,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		}else {
 			str="刷新打卡";
 		}
-		PublicReleaseLog log=new PublicReleaseLog(id,TokenManager.getAdminId(),3,str,new Date());
+		PublicReleaseLog log=new PublicReleaseLog(id,aid,3,str,new Date());
 		log.setPhotoUrl(photoUrl);
 		publicReleaseLogMapper.insertSelective(log);
 		publicReleaseMapper.updateByPrimaryKeySelective(p);

+ 0 - 1
src/main/java/com/goafanti/app/controller/AppUserController.java

@@ -275,7 +275,6 @@ public class AppUserController extends BaseApiController {
         	keyword.add(keyword3);
 		}
         String[] keywords=(String[])keyword.toArray(new String[keyword.size()]);
-        System.out.println(StringUtils.join(keywords,","));
         ia.setKeyword(StringUtils.join(keywords,","));
         if (bindingResult.hasErrors()) {
             res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),

+ 0 - 1
src/main/java/com/goafanti/business/service/impl/BusinessProjectServiceImpl.java

@@ -275,7 +275,6 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 	public int updateOrgProjectSize(BusinessProjectModel ps) {
 		BusinessProjectModel psz=projectSizeMapper.selectByPrimaryKey(ps.getId());
 		projectSizeConfiguration(ps, psz);
-		System.out.println(psz);
 		return projectSizeMapper.updateByPrimaryKeySelective(psz);
 	}
 	private void projectSizeConfiguration(BusinessProjectModel ps, BusinessProjectModel psz) {

+ 0 - 1
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -628,7 +628,6 @@ public class PublicController extends CertifyApiController {
           }
           }
           }
-          System.out.println(list.toString());
           return res;
           }
           public static void checkFile(MultipartFile file) throws IOException{

+ 2 - 0
src/main/java/com/goafanti/common/dao/OrganizationContactBookMapper.java

@@ -90,4 +90,6 @@ public interface OrganizationContactBookMapper {
 	void insertBatch(List<InputUserChannel> list);
 
 	void updateByUids(@Param("list")List<String> list, @Param("aid")String aid);
+
+	OrganizationContactBook getMajor(@Param("uid")String uid, @Param("aid")String aid);
 }

+ 6 - 0
src/main/java/com/goafanti/common/mapper/OrganizationContactBookMapper.xml

@@ -484,4 +484,10 @@
     </foreach>
       )
   </update>
+  <select id="getMajor"  resultType="com.goafanti.common.model.OrganizationContactBook">
+  select 
+    <include refid="Base_Column_List" />
+    from organization_contact_book
+    where uid = #{uid} and aid= #{aid}
+  </select>
 </mapper>

+ 0 - 2
src/main/java/com/goafanti/common/task/OrderDunTask.java

@@ -129,9 +129,7 @@ public class OrderDunTask {
   	  	  			Thread.sleep(2000);
   				}
   			}
-  			System.out.println(o.getId()+"\n"+o.getCustomizeTime()+"\n"+o.getDunType());
   	  		if (o.getDunType()==0) {
-  	  			System.out.println("======================================");
   	  		calendar2.setTime(o.getCustomizeTime());
   	  		CalendarTimeCleared(calendar);
   	  			if (calendar.equals(calendar2)) {