Parcourir la source

Merge branch 'test'

# Conflicts:
#	src/main/resources/props/config_local.properties
anderx il y a 2 ans
Parent
commit
1a346d4f4f

+ 38 - 55
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -1,36 +1,31 @@
 package com.goafanti.common.controller;
 
-import java.io.*;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.goafanti.admin.service.AdminService;
+import com.goafanti.admin.service.AttachmentService;
+import com.goafanti.common.bo.Error;
+import com.goafanti.common.bo.OutUser;
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.dao.TOrderMidMapper;
-import com.goafanti.common.dao.TOrderTaskMapper;
-import com.goafanti.common.model.TOrderMid;
-import com.goafanti.common.model.TOrderTask;
-import com.goafanti.common.utils.excel.Excel;
-import com.goafanti.common.utils.pdf.PDFUtils;
-import com.goafanti.common.utils.word.WordUtils;
-import com.goafanti.order.bo.TOrderTaskBo;
-import com.goafanti.order.enums.NewProjectStatus;
+import com.goafanti.common.enums.UserType;
+import com.goafanti.common.model.User;
+import com.goafanti.common.service.DistrictGlossoryService;
+import com.goafanti.common.service.IndustryCategoryService;
+import com.goafanti.common.utils.*;
+import com.goafanti.common.utils.excel.FileUtils;
+import com.goafanti.common.utils.excel.NewExcelUtil;
+import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.core.websocket.SystemWebSocketHandler;
+import com.goafanti.expenseAccount.service.ExpenseAccountService;
 import com.goafanti.order.enums.OrderImgEnums;
-import com.goafanti.order.enums.ProjectStage;
-import com.goafanti.order.enums.ProjectType;
-import com.goafanti.order.service.OrderProjectService;
+import com.goafanti.user.service.UserService;
 import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -44,31 +39,11 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.socket.TextMessage;
 
-import com.goafanti.admin.service.AdminService;
-import com.goafanti.admin.service.AttachmentService;
-import com.goafanti.common.bo.Error;
-import com.goafanti.common.bo.OutUser;
-import com.goafanti.common.bo.Result;
-import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.constant.ErrorConstants;
-import com.goafanti.common.enums.UserType;
-import com.goafanti.common.model.User;
-import com.goafanti.common.service.DistrictGlossoryService;
-import com.goafanti.common.service.FieldGlossoryService;
-import com.goafanti.common.service.IndustryCategoryService;
-import com.goafanti.common.utils.DateUtils;
-import com.goafanti.common.utils.LoggerUtils;
-import com.goafanti.common.utils.MobileMessageUtils;
-import com.goafanti.common.utils.PasswordUtil;
-import com.goafanti.common.utils.PictureUtils;
-import com.goafanti.common.utils.TimeUtils;
-import com.goafanti.common.utils.VerifyCodeUtils;
-import com.goafanti.common.utils.excel.FileUtils;
-import com.goafanti.common.utils.excel.NewExcelUtil;
-import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.core.websocket.SystemWebSocketHandler;
-import com.goafanti.patent.bo.PatentNewBo;
-import com.goafanti.user.service.UserService;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.util.*;
 
 @Controller
 @Scope(value = "prototype")
@@ -115,7 +90,7 @@ public class PublicController extends CertifyApiController {
 	private DistrictGlossoryService	districtGlossoryService;
 
 	@Autowired
-	private OrderProjectService	orderProjectService;
+	private ExpenseAccountService	expenseAccountService;
 
 	@Value(value = "${patentTemplate}")
 	private String					patentTemplate		= null;
@@ -780,10 +755,18 @@ public class PublicController extends CertifyApiController {
 			return res;
           }
 
-          @RequestMapping("/getUser")
-          public Result getUser() {
-        	  List<OutUser> list=userService.getuser();
-        	  NewExcelUtil<OutUser> excel=new NewExcelUtil<OutUser>(OutUser.class);
-      		return excel.exportExcel(list, "客户列表",uploadPath);
-          }
+	@RequestMapping("/getUser")
+	public Result getUser() {
+		List<OutUser> list=userService.getuser();
+		NewExcelUtil<OutUser> excel=new NewExcelUtil<OutUser>(OutUser.class);
+		return excel.exportExcel(list, "客户列表",uploadPath);
+	}
+
+
+	@RequestMapping("/supplementCheckNo")
+	public Result supplementCheckNo() {
+		Result res=new Result();
+		res.data(expenseAccountService.pushSupplementCheckNo());
+		return res;
+	}
 }

+ 5 - 0
src/main/java/com/goafanti/common/dao/ExpenseAccountMapper.java

@@ -25,6 +25,8 @@ public interface ExpenseAccountMapper {
 
     OutExpenseAccount selectByaidAndPrid(InputExpenseAccount in);
 
+    OutExpenseAccount selectByCheckNo(String checkNo);
+
     List<OutExpenseAccount> selectByaidAndType(@Param("aid") String aid,@Param("depId")String depId, @Param("type")Integer type,
                                                @Param("id")Integer id);
 
@@ -34,4 +36,7 @@ public interface ExpenseAccountMapper {
     List<ExpenseAccount> selectByDebitId(Integer debitId);
 
 
+    List<ExpenseAccount> selectByCheckNoNot();
+
+
 }

+ 53 - 7
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -28,12 +28,13 @@
     <result column="target_type" jdbcType="INTEGER" property="targetType" />
     <result column="liquidation_status" jdbcType="INTEGER" property="liquidationStatus" />
     <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <result column="check_no" jdbcType="VARCHAR" property="checkNo" />
   </resultMap>
   <sql id="Base_Column_List">
     id, prid, order_no, aid, aname, `type`, type_other, `status`, process_status, total_amount,
     attachment_url, apply_dep, pay_dep, eaaid, create_time, district_name, user_names,
     release_start, release_end, duration, examine_name, settlement_amount, debit_id,
-    target_type, liquidation_status, remarks
+    target_type, liquidation_status, remarks, check_no
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -54,7 +55,7 @@
       user_names, release_start, release_end,
       duration, examine_name, settlement_amount,
       debit_id, target_type, liquidation_status,
-      remarks)
+      remarks, check_no)
     values (#{prid,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR},
       #{aname,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, #{typeOther,jdbcType=VARCHAR},
       #{status,jdbcType=INTEGER}, #{processStatus,jdbcType=INTEGER}, #{totalAmount,jdbcType=DECIMAL},
@@ -63,7 +64,7 @@
       #{userNames,jdbcType=VARCHAR}, #{releaseStart,jdbcType=TIMESTAMP}, #{releaseEnd,jdbcType=TIMESTAMP},
       #{duration,jdbcType=DOUBLE}, #{examineName,jdbcType=VARCHAR}, #{settlementAmount,jdbcType=DECIMAL},
       #{debitId,jdbcType=INTEGER}, #{targetType,jdbcType=INTEGER}, #{liquidationStatus,jdbcType=INTEGER},
-      #{remarks,jdbcType=VARCHAR})
+      #{remarks,jdbcType=VARCHAR}, #{checkNo,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.ExpenseAccount" useGeneratedKeys="true">
     insert into expense_account
@@ -143,6 +144,9 @@
       <if test="remarks != null">
         remarks,
       </if>
+      <if test="checkNo != null">
+        check_no,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="prid != null">
@@ -220,6 +224,9 @@
       <if test="remarks != null">
         #{remarks,jdbcType=VARCHAR},
       </if>
+      <if test="checkNo != null">
+        #{checkNo,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.ExpenseAccount">
@@ -300,6 +307,9 @@
       <if test="remarks != null">
         remarks = #{remarks,jdbcType=VARCHAR},
       </if>
+      <if test="checkNo != null">
+        check_no = #{checkNo,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -329,7 +339,8 @@
       debit_id = #{debitId,jdbcType=INTEGER},
       target_type = #{targetType,jdbcType=INTEGER},
       liquidation_status = #{liquidationStatus,jdbcType=INTEGER},
-      remarks = #{remarks,jdbcType=VARCHAR}
+      remarks = #{remarks,jdbcType=VARCHAR},
+      check_no = #{checkNo,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -339,7 +350,7 @@
         a.attachment_url attachmentUrl,a.apply_dep applyDep, a.pay_dep payDep, a.eaaid,a.district_name districtName,
         a.user_names userNames,a.create_time, a.release_start,a.release_end, a.duration,b.name appDepName,
         c.name payDepName,d.name ,d.bank ,d.accounts ,a.settlement_amount settlementAmount,
-        a.liquidation_status liquidationStatus, a.remarks,
+        a.liquidation_status liquidationStatus, a.remarks,a.check_no checkNo,
            date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,
             date_format(a.release_start,'%Y-%m-%d %H:%i:%S')releaseStartStr,
             date_format(a.release_end,'%Y-%m-%d %H:%i:%S')releaseEndStr
@@ -353,10 +364,19 @@
     WHERE a.id= #{id}
   </select>
 
+  <select id="selectByCheckNo" resultType="com.goafanti.expenseAccount.bo.OutExpenseAccount">
+    SELECT
+    <include refid="selectDtailsSql"/>
+    FROM expense_account a left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
+    left join expense_account_private d on a.eaaid=d.id left join t_order_new o on a.order_no =o.order_no
+    left join t_order_mid tm on a.order_no =tm.order_no
+    WHERE a.check_no= #{checkNo}
+  </select>
+
 
   <select id="selectExpenseAccountList" resultType="com.goafanti.expenseAccount.bo.OutExpenseAccountBo">
     select a.id,a.total_amount totalAmount,a.`type`,a.process_status processStatus,a.status,a.examine_name examineName,a.type_other typeOther,
-    a.attachment_url attachmentUrl,a.target_type targetType , e.contract_no contractNo,tm.buyer_name buyerName ,
+    a.attachment_url attachmentUrl,a.target_type targetType , e.contract_no contractNo,tm.buyer_name buyerName ,a.check_no checkNo,
     <if test="processStatus ==1">
       eae.type eaeType,
     </if>
@@ -373,6 +393,12 @@
     where 1=1
       <if test="processStatus ==2">
         and a.process_status>0
+        <if test="examineStatus ==0">
+          and a.status=1
+        </if>
+        <if test="examineStatus ==1">
+          and a.status=2
+        </if>
       </if>
     <if test=" aid !=null">
     and a.aid= #{aid}
@@ -428,6 +454,12 @@
     where 1=1
     <if test="processStatus ==2">
       and a.process_status>0
+      <if test="examineStatus ==0">
+        and a.status=1
+      </if>
+      <if test="examineStatus ==1">
+        and a.status=2
+      </if>
     </if>
     <if test=" aid !=null">
       and a.aid= #{aid}
@@ -479,6 +511,12 @@
     where 1=1
     <if test="processStatus ==2">
       and a.process_status>0
+      <if test="examineStatus ==0">
+        and a.status=1
+      </if>
+      <if test="examineStatus ==1">
+        and a.status=2
+      </if>
     </if>
     <if test=" aid !=null">
       and a.aid= #{aid}
@@ -528,13 +566,15 @@
     WHERE a.status= #{status}
     and a.prid= #{prid} and a.aid = #{aid}
   </select>
+
+
     <select id="selectByaidAndType" resultType="com.goafanti.expenseAccount.bo.OutExpenseAccount">
       SELECT
         a.id, a.prid, a.order_no orderNo, o.contract_no contractNo ,tm.buyer_name buyerName, a.aid, a.aname, a.`type`,
         a.type_other typeOther , a.status,a.process_status processStatus,a.total_amount totalAmount,a.debit_id debitId,
         a.attachment_url attachmentUrl,a.apply_dep applyDep, a.pay_dep payDep, a.eaaid,a.district_name districtName,
         a.user_names userNames,a.create_time, a.release_start,a.release_end, a.duration,b.name appDepName,
-        c.name payDepName,d.name ,d.bank ,d.accounts ,t0.amount settlementAmount,
+        c.name payDepName,d.name ,d.bank ,d.accounts ,t0.amount settlementAmount,a.check_no checkNo,
         a.liquidation_status liquidationStatus, a.remarks,
         date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,
         date_format(a.release_start,'%Y-%m-%d %H:%i:%S')releaseStartStr,
@@ -570,5 +610,11 @@
     from expense_account
     where debit_id = #{debitId}
   </select>
+  <select id="selectByCheckNoNot" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+  select
+  <include refid="Base_Column_List" />
+  from expense_account
+    where check_no =''
+  </select>
 
 </mapper>

+ 15 - 2
src/main/java/com/goafanti/common/model/ExpenseAccount.java

@@ -32,7 +32,7 @@ public class ExpenseAccount implements Serializable {
     private String aname;
 
     /**
-     * 分类 0=其他,1=差旅费,2=非业务报销, 3=第三方付款,4=申请借支
+     * 分类 0=其他,1=差旅费,2=非业务报销, 3=第三方付款,4=申请借支,5=抵扣
      */
     private Integer type;
 
@@ -127,7 +127,7 @@ public class ExpenseAccount implements Serializable {
     private Integer targetType;
 
     /**
-     * 清算状态 0-未抵扣,1=已抵扣,未全款,2=已全款
+     * 清算状态 0-未抵扣,1=已抵扣,未全款,2=已全款,未审核,3已全款,已审核
      */
     private Integer liquidationStatus;
 
@@ -136,6 +136,11 @@ public class ExpenseAccount implements Serializable {
      */
     private String remarks;
 
+    /**
+     * 报销查询编号
+     */
+    private String checkNo;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -345,4 +350,12 @@ public class ExpenseAccount implements Serializable {
     public void setRemarks(String remarks) {
         this.remarks = remarks;
     }
+
+    public String getCheckNo() {
+        return checkNo;
+    }
+
+    public void setCheckNo(String checkNo) {
+        this.checkNo = checkNo;
+    }
 }

+ 10 - 0
src/main/java/com/goafanti/core/mybatis/BaseMybatisDao.java

@@ -203,6 +203,16 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 
 	}
 
+	/**
+	 * 分页并统计总金额
+	 * @param sqlId   字段sql名称
+	 * @param countId count sql名称
+	 * @param coutnAoumt 统计金额sql名称
+	 * @param params 参数
+	 * @param pageNo 页码
+	 * @param pageSize 页面显示数
+	 * @return
+	 */
 	public Pagination<?> findPagePlus(String sqlId, String countId,String coutnAoumt, Map<String, Object> params, Integer pageNo,
 								  Integer pageSize) {
 		Pagination<?> page = findPage(sqlId, countId, params, pageNo, pageSize);

+ 10 - 5
src/main/java/com/goafanti/core/mybatis/JDBCIdGenerator.java

@@ -1,14 +1,13 @@
 package com.goafanti.core.mybatis;
 
-import java.text.MessageFormat;
-import java.util.Calendar;
-
+import com.goafanti.common.utils.LoggerUtils;
+import com.goafanti.common.utils.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.Assert;
 
-import com.goafanti.common.utils.LoggerUtils;
-import com.goafanti.common.utils.StringUtils;
+import java.text.MessageFormat;
+import java.util.Calendar;
 
 /**
  *
@@ -107,4 +106,10 @@ public class JDBCIdGenerator {
 		}
 		return time;
 	}
+
+	public String getNOgenerateId(){
+		StringBuffer str=new StringBuffer("NO");
+		str=str.append(generateId());
+		return str.toString();
+	}
 }

+ 3 - 0
src/main/java/com/goafanti/expenseAccount/bo/InputPageListBo.java

@@ -3,8 +3,11 @@ package com.goafanti.expenseAccount.bo;
 public class InputPageListBo {
     private String startTime;
     private String endTime;
+//    状态 0=草稿,1=审核中,2=完成,3=驳回
     private Integer status;
+//    审核状态 0审核中  1已审核
     private Integer examineStatus;
+//    查询人员 0自己 1审核 2查看
     private Integer processStatus;
 
     //同编号搜索、按客户名称搜索 、按部门/公司搜索 、按报销类型搜索、按报销公司部门/公司、按支付部门/公司搜索、按审核状态(财务审核中-不同人员针对的审核状态不一样、已完成)、报销时间(按报销的时间段进行搜索)

+ 9 - 0
src/main/java/com/goafanti/expenseAccount/bo/OutExpenseAccountBo.java

@@ -18,12 +18,21 @@ public class OutExpenseAccountBo {
     private Integer targetType;
 
     private String contractNo;
+    private String checkNo;
     private String buyerName;
     private String depName;
     private String financeName;
     private String attachmentUrl;
     private Integer examine;
 
+    public String getCheckNo() {
+        return checkNo;
+    }
+
+    public void setCheckNo(String checkNo) {
+        this.checkNo = checkNo;
+    }
+
     public Integer getExamine() {
         return examine;
     }

+ 12 - 0
src/main/java/com/goafanti/expenseAccount/controller/ExpenseAccountController.java

@@ -118,6 +118,18 @@ public class ExpenseAccountController extends CertifyApiController {
         return res;
     }
 
+    /**
+     * 报销列表
+     * @param checkNo
+     * @return
+     */
+    @RequestMapping(value = "/selectByCheckNo",method = RequestMethod.GET)
+    public Result selectByCheckNo(String checkNo ){
+        Result res =new Result();
+        res.setData(expenseAccountService.selectByCheckNo(checkNo));
+        return res;
+    }
+
 
 
 

+ 4 - 0
src/main/java/com/goafanti/expenseAccount/service/ExpenseAccountService.java

@@ -35,4 +35,8 @@ public interface ExpenseAccountService {
 
 
     void statisticsEvict(String name, String depId, String startTime, String endTime);
+
+    Object pushSupplementCheckNo();
+
+    Object selectByCheckNo(String checkNo);
 }

+ 29 - 1
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -9,8 +9,12 @@ import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.NoticeTypes;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.*;
-import com.goafanti.common.utils.*;
+import com.goafanti.common.utils.AsyncUtils;
+import com.goafanti.common.utils.DateUtils;
+import com.goafanti.common.utils.LoggerUtils;
+import com.goafanti.common.utils.WeChatUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.JDBCIdGenerator;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.expenseAccount.Enums.EAProcessStatus;
@@ -45,6 +49,8 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     private ExpenseAccountPrivateMapper expenseAccountPrivateMapper;
     @Autowired
     private ExpenseAccountExamineMapper expenseAccountExamineMapper;
+    @Autowired
+    private JDBCIdGenerator idGenerator;
 
 
 
@@ -53,6 +59,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     @Override
     public Integer add(InputExpenseAccount in) {
         //设置付款部门和支付部门
+        in.setCheckNo(idGenerator.getNOgenerateId());
         if (in.getAid()!=null){
             Admin admin = adminMapper.selectByPrimaryKey(in.getAid());
             in.setAname(admin.getName());
@@ -553,6 +560,13 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         return useEa;
     }
 
+
+    @Override
+    public Object selectByCheckNo(String checkNo) {
+        OutExpenseAccount useEa = expenseAccountMapper.selectByCheckNo(checkNo);
+        return useEa;
+    }
+
     /**
      * 计算当前报销显示抵扣金额
      * @param useEa
@@ -760,6 +774,20 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         LoggerUtils.debug(getClass(), "报销统计清楚缓存。");
     }
 
+    @Override
+    public Object pushSupplementCheckNo() {
+        List<ExpenseAccount> list = expenseAccountMapper.selectByCheckNoNot();
+        if (!list.isEmpty()){
+            list.forEach(e ->{
+                ExpenseAccount ea=new ExpenseAccount();
+                ea.setId(e.getId());
+                ea.setCheckNo(idGenerator.getNOgenerateId());
+                expenseAccountMapper.updateByPrimaryKeySelective(ea);
+            });
+            return 1;
+        }
+        return 0;
+    }
 
 
 

+ 1 - 13
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -232,22 +232,10 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@Override
 	public List<NewOrderChangeBo> orderChangeDetails(String orderNo) {
 		List<NewOrderChangeBo> list=newOrderChangeMapper.selectByorderNo(orderNo);
-		for (NewOrderChangeBo noc : list) {
-			noc.setExamineName(getExamineName(noc));
-//			int isExamine=orderExamineMapper.selectByOrderNoAndAid(noc.getOrderNo(),TokenManager.getAdminId());
-//			if (noc.getVoucherUrl()!=null) {
-//				TOrderNew t=tOrderNewMapper.selectByPrimaryKey(noc.getOrderNo());
-//				noc.setVoucherUrl(pushOrderService.changeProcessStatusConstant(noc.getVoucherUrl(),t.getSalesmanId(),noc.getProcessState(),noc.getStatus()));
-//			}
-//			noc.setIsExamine(isExamine);
-		}
 		return list;
 	}
 
-	private String getExamineName(NewOrderChangeBo noc) {
-		String names="";
-		return names;
-	}
+
 
 	@Override
 	public NewOrderChangeBo orderChangeDetailsById(Integer id) {

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

@@ -1128,7 +1128,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			throw new BusinessException("转换异常");
 		}
 		List<Integer> is=publicReleaseMapper.checkTime(TokenManager.getAdminId(),in.getReleaseStart(),in.getReleaseEnd());
-		if (is.size()>1) {
+		if (is.size()>=1) {
 			return true;
 		}else  if(is.size()==1){
 			//如果id为新增那么直接不允许时间重复

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -52,11 +52,11 @@ yxjl_max=100
 amb.maxLvl=6
 
 avatar.host=//static.jishutao.com
-#static.host=//static.jishutao.com/1.2.72
+static.host=//static.jishutao.com/1.2.81
 rd.static.host=//static.jishutao.com/RD/1.0.00
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.62
-static.host=//172.16.1.187/1.2.81
+#static.host=//172.16.1.187/1.2.81
 
 #\u5FAE\u4FE1\u6253\u5361\u5C0F\u7A0B\u5E8F
 wx.appId=wxff2f5720ed7d7f63