Browse Source

新订单催款开发

Signed-off-by: anderx <312518615@qq.com>
anderx 6 years ago
parent
commit
7ff2930555

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

@@ -96,5 +96,5 @@ public interface NewOrderDunMapper {
      */
     int updateByPrimaryKey(NewOrderDun record);
 
-	List<OutNewOrderDunBo> selectNewOrderDun(String orderNo, String aid);
+	List<OutNewOrderDunBo> selectListNewOrderDun(@Param("orderNo")String orderNo,@Param("aid") String aid);
 }

+ 13 - 0
src/main/java/com/goafanti/order/bo/OutNewOrderDunBo.java

@@ -1,7 +1,20 @@
 package com.goafanti.order.bo;
 
 import com.goafanti.common.model.NewOrderDun;
+import com.goafanti.order.enums.NewOrderDunType;
 
 public class OutNewOrderDunBo extends NewOrderDun {
+	private String dunTypeName;
+
+	public String getDunTypeName() {
+		if(super.getDunType()!=null) {
+			return NewOrderDunType.getValueByCode(super.getDunType());
+		}
+		return dunTypeName;
+	}
+
+	public void setDunTypeName(String dunTypeName) {
+		this.dunTypeName = dunTypeName;
+	}
 
 }

+ 42 - 7
src/main/java/com/goafanti/order/controller/AdminNewOrderDunApiController.java

@@ -30,7 +30,11 @@ public class AdminNewOrderDunApiController extends CertifyApiController {
 			res.getError().add(buildError("", "订单编号与项目编号必须指定"));
 			return res;
 		}
-		newOrderDunService.createDun(ib);
+		if(null==ib.getProjectType()||null==ib.getDunType()) {
+			res.getError().add(buildError("", "项目分类和催款分类必须指定"));
+			return res;
+		}
+		res.data(newOrderDunService.createDun(ib));
 		return res;
 	}	
 	/**
@@ -40,26 +44,57 @@ public class AdminNewOrderDunApiController extends CertifyApiController {
 	@RequestMapping(value = "/updateDun",method = RequestMethod.POST)
 	public Result updateDun(InputNewOrderDunBo ib){
 		Result res = new Result();
-		newOrderDunService.updateDun(ib);
+		if(null==ib.getId()) {
+			res.getError().add(buildError("", "催款ID必须指定"));
+			return res;
+		}
+		if(StringUtils.isBlank(ib.getOrderNo())||null==ib.getTid()) {
+			res.getError().add(buildError("", "订单编号与项目编号必须指定"));
+			return res;
+		}
+		if(null==ib.getProjectType()||null==ib.getDunType()) {
+			res.getError().add(buildError("", "项目分类和催款分类必须指定"));
+			return res;
+		}
+		res.data(newOrderDunService.updateDun(ib));
 		return res;
-	}	/**
+	}	
+	/**
 	 * 删除催款信息
 	 * @return
 	 */
 	@RequestMapping(value = "/deleteDun",method = RequestMethod.POST)
 	public Result deleteDun(Integer id){
 		Result res = new Result();
-		newOrderDunService.deleteDun( id);
+		if(null==id) {
+			res.getError().add(buildError("", "催款ID必须指定"));
+			return res;
+		}
+		res.data(newOrderDunService.deleteDun( id));
+		return res;
+	}	
+	/**
+	 * 查看催款信息
+	 * @return
+	 */
+	@RequestMapping(value = "/selectDun",method = RequestMethod.GET)
+	public Result selectDun(Integer id){
+		Result res = new Result();
+		if(null==id) {
+			res.getError().add(buildError("", "催款ID必须指定"));
+			return res;
+		}
+		res.data(newOrderDunService.selectDun( id));
 		return res;
 	}	
 	/**
 	 * 催款信息列表
 	 * @return
 	 */
-	@RequestMapping(value = "/selectNewOrderDun",method = RequestMethod.POST)
-	public Result selectNewOrderDun(String OrderNo){
+	@RequestMapping(value = "/selectListNewOrderDun",method = RequestMethod.GET)
+	public Result selectListNewOrderDun(String OrderNo){
 		Result res = new Result();
-		newOrderDunService.selectNewOrderDun(OrderNo);
+		newOrderDunService.selectListNewOrderDun(OrderNo);
 		return res;
 	}	
 }

+ 71 - 0
src/main/java/com/goafanti/order/enums/NewOrderDunType.java

@@ -0,0 +1,71 @@
+package com.goafanti.order.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum NewOrderDunType {
+	CGZH_SQ(1,"成果转化-首期"),
+	CGZH_WC(2,"成果转化-完成"),
+	COMMON_SQ(11,"通用-首期"),
+	COMMON_NGS(12,"通用-拟公示"),
+	COMMON_XZ(13,"通用-下证"),
+	KJXM_SQ(21,"科技项目-首期"),
+	KJXM_LX(22,"科技项目-立项(公示)"),
+	KJXM_BK(23,"科技项目-拨款"),
+	KJJR_SQ(31,"科技金融-首期"),
+	KJJR_BK(32,"科技金融-拨款"),
+	CS_SQ(41,"财税-首期"),
+	CS_DQ(42,"财税-到期"),
+	HY_SQ(51,"会员-首期"),
+	HY_DQ(52,"会员-到期"),
+	RJKF_SQ(61,"软件开发-首期"),
+	RJKF_WZ(62,"软件开发-完成"),
+	ZSCQ_SQ(71,"知识产权-首期"),
+	ZSCQ_GS(71,"知识产权-公示"),
+	INVALID(99,"未知");
+	
+	private NewOrderDunType(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, NewOrderDunType> status = new HashMap<Integer, NewOrderDunType>();
+
+	static {
+		for (NewOrderDunType value : NewOrderDunType.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	public static NewOrderDunType getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return INVALID;
+	}
+	public static String getValueByCode(Integer code){
+        for(NewOrderDunType orderType:NewOrderDunType.values()){
+            if(code.equals(orderType.getCode())){
+                return orderType.getDesc();
+            }
+        }
+        return  INVALID.getDesc();
+    }
+	public static boolean containsType(Integer code) {
+		return status.containsKey(code);
+	}
+	
+	private Integer	code;
+	private String	desc;
+	public Integer getCode() {
+		return code;
+	}
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+	public String getDesc() {
+		return desc;
+	}
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+}

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

@@ -13,7 +13,9 @@ public interface NewOrderDunService {
 	
 	int deleteDun(Integer id);
 	
-	List<OutNewOrderDunBo> selectNewOrderDun(String OrderNo);
+	List<OutNewOrderDunBo> selectListNewOrderDun(String OrderNo);
+
+	OutNewOrderDunBo selectDun(Integer id);
 
 
 }

+ 16 - 3
src/main/java/com/goafanti/order/service/impl/NewOrderDunServiceImpl.java

@@ -1,7 +1,9 @@
 package com.goafanti.order.service.impl;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
+import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,20 +22,31 @@ public class NewOrderDunServiceImpl extends BaseMybatisDao<NewOrderDunMapper> im
 	
 	@Override
 	public int createDun(InputNewOrderDunBo ib) {
+		ib.setAid(TokenManager.getAdminId());
 		return newOrderDunMapper.insertSelective(ib);
 	}
 	@Override
 	public int updateDun(InputNewOrderDunBo ib) {
-		return newOrderDunMapper.insertSelective(ib);
+		return newOrderDunMapper.updateByPrimaryKeySelective(ib);
 	}
 	@Override
 	public int deleteDun(Integer id) {
 		return newOrderDunMapper.deleteByPrimaryKey(id);
 	}
 	@Override
-	public List<OutNewOrderDunBo> selectNewOrderDun(String orderNo) {
+	public List<OutNewOrderDunBo> selectListNewOrderDun(String orderNo) {
 		String aid=TokenManager.getAdminId();
-		return newOrderDunMapper.selectNewOrderDun(orderNo,aid);
+		return newOrderDunMapper.selectListNewOrderDun(orderNo,aid);
+	}
+	@Override
+	public OutNewOrderDunBo selectDun(Integer id) {
+		OutNewOrderDunBo ob=new OutNewOrderDunBo();
+		try {
+			BeanUtils.copyProperties(ob, newOrderDunMapper.selectByPrimaryKey(id));
+		} catch (IllegalAccessException | InvocationTargetException e) {
+			e.printStackTrace();
+		}
+		return ob;
 	}
 
 }

+ 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.26
-avatar.host=//sb.jishutao.com
+#static.host=//sb.jishutao.com/1.1.26
+#avatar.host=//sb.jishutao.com
 
 #连测试
-#avatar.host=//static.jishutao.com
-#static.host=//static.jishutao.com/1.1.26
+avatar.host=//static.jishutao.com
+static.host=//static.jishutao.com/1.1.26
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload