Administrator 4 years ago
parent
commit
9fe469045d

+ 0 - 1
src/main/java/com/goafanti/admin/service/PublicReleaseService.java

@@ -11,7 +11,6 @@ import com.goafanti.admin.bo.OutPublicDtails;
 import com.goafanti.admin.bo.OutPublicRelease;
 import com.goafanti.admin.bo.OutPublicStatistics;
 import com.goafanti.admin.bo.outPublicReleaseLog;
-import com.goafanti.user.bo.OutUserChannel;
 
 public interface PublicReleaseService {
 

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

@@ -202,10 +202,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		User u=userMapper.selectByPrimaryKey(use.getUid());
 		if (status==0) {
 			type=NoticeStatus.PUBLIC_RELEASE_NO.getCode();
-			content="["+u.getNickname()+"]的外出申请,未通过审核!";
+			content="["+u.getNickname()+"]公司的外出申请,未通过审核!";
 		}else if(status==2) {
 			type=NoticeStatus.PUBLIC_RELEASE_YES.getCode();
-			content="["+u.getNickname()+"]的外出申请,已通过审核!";
+			content="["+u.getNickname()+"]公司的外出申请,已通过审核!";
 		}
 		sendNoticeAndSoucket(a.getId(),type,content);
 		if (my.getOpenId()!=null) {

+ 2 - 0
src/main/java/com/goafanti/common/utils/DecimalCalculate.java

@@ -75,6 +75,7 @@ public class DecimalCalculate {
 	 *            表示表示需要精确到小数点以后几位。
 	 * @return 两个参数的商
 	 */
+	@SuppressWarnings("deprecation")
 	public static double div(double v1, double v2, int scale) {
 		if (scale < 0) {
 			throw new IllegalArgumentException("The scale must be a positive integer or zero");
@@ -93,6 +94,7 @@ public class DecimalCalculate {
 	 *            小数点后保留几位
 	 * @return 四舍五入后的结果
 	 */
+	@SuppressWarnings("deprecation")
 	public static double round(double v, int scale) {
 		if (scale < 0) {
 			throw new IllegalArgumentException("The scale must be a positive integer or zero");