Преглед на файлове

Merge branch 'test' of jishutao/kede-server into prod

anderx преди 2 години
родител
ревизия
7689dfea11

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -2112,7 +2112,7 @@
     b.delete_sign deleteSign ,b.total_amount totalAmount ,b.sales_type salesType ,b.other,
     a.process_status status,a.commodity_id commodityId,a.commodity_name commodityName,
     a.commodity_quantity commodityQuantity,a.task_comment taskComment,a.picture_url pictureUrl,
-    e.service_life serviceLife ,e.service_year serviceYear,e.year_sum yearSum
+    e.service_life serviceLife ,e.service_year serviceYear,e.year_sum yearSum,e.contract_term contractTerm
     from t_order_task a left join t_order_new b on a.order_no =b.order_no
     left join t_order_mid c on a.order_no =c.order_no
     left join t_task_member e on a.id=e.tid

+ 9 - 0
src/main/java/com/goafanti/order/bo/OutMemberList.java

@@ -52,6 +52,15 @@ public class OutMemberList {
     private String serviceYear;
     @Excel(name = "服务年数",width = MINWIDTH)
     private Integer yearSum;
+    private String contractTerm;
+
+    public String getContractTerm() {
+        return contractTerm;
+    }
+
+    public void setContractTerm(String contractTerm) {
+        this.contractTerm = contractTerm;
+    }
 
     public String getServiceLife() {
         return serviceLife;

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

@@ -1169,7 +1169,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为新增那么直接不允许时间重复
@@ -1179,7 +1179,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				//如果有id,与获取id一直,则为当前修改可以
 				if (in.getId().equals(is.get(0))){
 					return false;
-
 				}else {
 					return true;
 				}

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -52,7 +52,7 @@ amb.maxLvl=6
 
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.85
+static.host=//static.jishutao.com/1.2.86
 rd.static.host=//static.jishutao.com/RD/1.0.01
 avatar.upload.host=//static.jishutao.com/upload