Browse Source

Merge remote-tracking branch 'origin/test' into dev

anderx 6 years ago
parent
commit
2d6a7cc52f

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

@@ -616,7 +616,7 @@
 	<select id="getDepMaxNo"  parameterType="java.lang.String" resultType="java.util.Map">
 select a.abbreviation ,b.maxNo
 from department a left join (select order_dep,max(contract_no) as maxNo from t_order_new
-where create_time > '2019-5-28'group by order_dep) b on b.order_dep=a.id
+where create_time > '2019-5-31'group by order_dep) b on b.order_dep=a.id
 where 	id = #{id,jdbcType=VARCHAR};
 	</select>
 </mapper>

+ 3 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -260,7 +260,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}
 		String sno=null;
 		if (StringUtils.isBlank(s)||s.length()<13) {
-			t.setContractNo(""+mp.get("abbreviation")+"-"+y+"0001");
+			String cn=""+mp.get("abbreviation")+"-"+y+"0001";
+			cn=iterationNo(cn,mp.get("abbreviation"),y,1);
+			t.setContractNo(cn);
 		}else {
 			int ty=Integer.parseInt(s.substring(s.indexOf("-")+1, s.length()-4));
 			int no=Integer.parseInt(s.substring(s.length()-4, s.length()));

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

@@ -54,7 +54,7 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-static.host=//static.kedexinxi.com/1.1.01
+static.host=//static.kedexinxi.com/1.1.05
 portal.host=//static.kedexinxi.com/portal/2.0.6
 avatar.host=//static.kedexinxi.com
 avatar.upload.host=//static.kedexinxi.com/upload