Browse Source

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

Conflicts:
	GeneratorConfig.xml
anderx 6 years ago
parent
commit
31fa742b8b

+ 6 - 1
src/main/java/com/goafanti/common/dao/OrganizationManagementMapper.java

@@ -134,5 +134,10 @@ public interface OrganizationManagementMapper {
 	 * @return
 	 */
 	List<OrganizationManagement> selectAllDeps();
-	Map<String, Object> getDepMaxNo(String orderDep);
+	/**
+	 * 查询最大编号
+	 * @param abbreviation
+	 * @return
+	 */
+	String getMaxAbbreviation(String abbreviation);
 }

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

@@ -19,6 +19,7 @@
     <result column="super_id" jdbcType="VARCHAR" property="superId" />
     <result column="remarks" jdbcType="VARCHAR" property="remarks" />
     <result column="status" jdbcType="VARCHAR" property="status" />
+    <result column="abbreviation" jdbcType="VARCHAR" property="abbreviation" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -95,7 +96,7 @@
       This element was generated on Thu Nov 30 11:09:29 CST 2017.
     -->
     id, create_id, create_time, update_time, deleted_sign, name, type, manager_id, dep_no, 
-    super_id, remarks, status
+    super_id, remarks, status,abbreviation
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.OrganizationManagementExample" resultMap="BaseResultMap">
     <!--
@@ -613,10 +614,9 @@
 	<select id="selectAllDeps" resultMap="BaseResultMap">
 		select id,name,dep_no from department
 	</select>
-	<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-31'group by order_dep) b on b.order_dep=a.id
-where 	id = #{id,jdbcType=VARCHAR};
+	<select id="getMaxAbbreviation"  parameterType="java.lang.String" resultType="java.lang.String">
+	select max(contract_no) as maxNo from t_order_new
+	where create_time > '2019-5-31'
+	and contract_no like  concat(#{abbreviation,jdbcType=VARCHAR},'%') 
 	</select>
 </mapper>

+ 5 - 4
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -151,7 +151,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/updateServiceOrderNew",method = RequestMethod.POST)
-	public Result updateServiceOrder(TOrderNew t,Integer isSubmit,String signDate){
+	public Result updateServiceOrder(TOrderNew t,String isSubmit,String signDate){
 		Result res = new Result();
 		if(StringUtils.isBlank(t.getOrderNo())){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "订单编号"));
@@ -166,10 +166,11 @@ public class AdminNewOrderApiController extends CertifyApiController {
 			return res;
 		}
 		if(null==isSubmit){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "提状态"));
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "提状态"));
 			return res;
 		}
-		if (isSubmit==1) {
+		int i=Integer.valueOf(isSubmit);
+		if (i==1) {
 			if (orderNewService.checkORderTask(t.getOrderNo())) {
 				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "主项目"));
 				return res;
@@ -188,7 +189,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 				e.printStackTrace();
 			}
 		}
-		res.setData(orderNewService.updateServiceOrder(t,isSubmit));
+		res.setData(orderNewService.updateServiceOrder(t,i));
 		return res;
 	}
 	

+ 20 - 23
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -16,13 +16,11 @@ import javax.mail.MessagingException;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.xmlbeans.impl.xb.xsdschema.Public;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import com.alibaba.fastjson.JSON;
 import com.goafanti.admin.bo.AdminListBo;
@@ -52,7 +50,6 @@ import com.goafanti.common.model.TOrderBack;
 import com.goafanti.common.model.TOrderDun;
 import com.goafanti.common.model.TOrderLog;
 import com.goafanti.common.model.TOrderNew;
-import com.goafanti.common.model.TOrderRefund;
 import com.goafanti.common.model.TOrderRefundWithBLOBs;
 import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.utils.ExportExcelUtil;
@@ -81,7 +78,6 @@ import com.goafanti.order.enums.TaskState;
 import com.goafanti.order.enums.refundState;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.order.service.OrderService;
-import com.mysql.fabric.xmlrpc.base.Data;
 
 @Service
 public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> implements OrderNewService {
@@ -248,34 +244,34 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	private void createContractNo(TOrderNew t) {
 		//根据订单部门或许合同编号前缀
-		Map<String, Object> mp;
-		mp=organizationManagementMapper.getDepMaxNo(t.getOrderDep());
+		OrganizationManagement dep=organizationManagementMapper.selectByPrimaryKey(t.getOrderDep());
+		if (dep==null||StringUtils.isBlank(dep.getAbbreviation())) {
+			throw new BusinessException(new Error( "该部门缩写不存在","该部门缩写不存在"));
+		}
+		//根据前缀查询最大编号
+		String max=organizationManagementMapper.getMaxAbbreviation(dep.getAbbreviation());
 		//获取日期年份
 		Calendar c=Calendar.getInstance();
 		int y=c.getWeekYear();
-		String s=null;
-		if(mp!=null)s=(String) mp.get("maxNo");
-		if (mp==null) {
-			throw new BusinessException(new Error( "该部门缩写不存在","该部门缩写不存在"));
-		}
+		
 		String sno=null;
-		if (StringUtils.isBlank(s)||s.length()<13) {
-			String cn=""+mp.get("abbreviation")+"-"+y+"0001";
-			cn=iterationNo(cn,mp.get("abbreviation"),y,1);
+		if (StringUtils.isBlank(max)||max.length()<13) {
+			String cn=""+dep.getAbbreviation()+"-"+y+"0001";
+			cn=iterationNo(cn,dep.getAbbreviation(),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()));
-			no++;
+			int ty=Integer.parseInt(max.substring(max.indexOf("-")+1, max.length()-4));
+			int no=Integer.parseInt(max.substring(max.length()-4, max.length()));
+			
 			//得出字符串
-			sno = countNo(mp.get("abbreviation"), sno, ty, no);
+			sno = countNo(dep.getAbbreviation(), sno, ty, no);
 			//迭代得出最后编码
-			sno=iterationNo(sno,mp.get("abbreviation"),ty,no);
+			sno=iterationNo(sno,dep.getAbbreviation(),ty,no);
 			//年份小于等于则获取最大值加1,大于则获取最新年份
 			if (y<=ty) {
 				t.setContractNo(sno);
 			}else {
-				t.setContractNo(""+mp.get("abbreviation")+"-"+y+"0001");
+				t.setContractNo(""+dep.getAbbreviation()+"-"+y+"0001");
 			}
 		}
 	}
@@ -284,7 +280,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	private String iterationNo(String sno ,Object mp, int ty, int no) {
 		if (tOrderNewMapper.checkContractNo(sno)>0) {
-			int i=Integer.parseInt(sno.substring(sno.indexOf("-")+2, sno.length()-4));
+			int i=Integer.parseInt(sno.substring(sno.indexOf("-")+4, sno.length()-4));
 			sno=countNo(mp, sno, ty, i);
 			iterationNo(sno,mp,ty,i);
 		}
@@ -294,11 +290,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 
 	private String countNo(Object object, String sno, int ty, int no) {
+		no++;
 		if (no>0&&no<10) {
 			sno=object+"-"+ty+"000"+no;
-		}else if (no>10&&no<100) {
+		}else if (no>9&&no<100) {
 			sno=object+"-"+ty+"00"+no;
-		} else if (no>100&&no<1000) {
+		} else if (no>99&&no<1000) {
 			sno=object+"-"+ty+"0"+no;
 		} else if(no>1000){
 			sno=object+"-"+ty+no;

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

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-static.host=//sb.jishutao.com/1.1.05
-avatar.host=//sb.jishutao.com
+#static.host=//sb.jishutao.com/1.1.05
+#avatar.host=//sb.jishutao.com
 
 #连生产
-#avatar.host=//static.kedexinxi.com
-#static.host=//s.kedexinxi.com/1.1.05
+avatar.host=//static.kedexinxi.com
+static.host=//s.kedexinxi.com/1.1.05
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload