Browse Source

修改新催款的类型定义

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

+ 11 - 0
src/main/java/com/goafanti/common/mapper/NewOrderDunMapper.xml

@@ -347,4 +347,15 @@
       create_time = #{createTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+  <select id="selectListNewOrderDun" resultType="com.goafanti.order.bo.OutNewOrderDunBo">
+  select id, order_no orderNo, tid, project_type projectType, dun_type dunType, wait_day waitDay, 
+  effective_year effectiveYear, aid, create_time createTime
+  from new_order_dun where 1=1
+  <if test="orderNo!=null and orderNo!=''">
+  and  order_no= #{orderNo}
+  </if>
+  <if test="aid != null and aid != ''">
+  and  aid= #{aid}
+  </if>
+  </select>
 </mapper>

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

@@ -7,8 +7,8 @@ public class OutNewOrderDunBo extends NewOrderDun {
 	private String dunTypeName;
 
 	public String getDunTypeName() {
-		if(super.getDunType()!=null) {
-			return NewOrderDunType.getValueByCode(super.getDunType());
+		if(super.getDunType()!=null&&super.getProjectType()!=null) {
+			return NewOrderDunType.getValueByCode(Integer.valueOf(""+super.getProjectType()+super.getDunType()));
 		}
 		return dunTypeName;
 	}

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

@@ -94,7 +94,7 @@ public class AdminNewOrderDunApiController extends CertifyApiController {
 	@RequestMapping(value = "/selectListNewOrderDun",method = RequestMethod.GET)
 	public Result selectListNewOrderDun(String OrderNo){
 		Result res = new Result();
-		newOrderDunService.selectListNewOrderDun(OrderNo);
+		res.data(newOrderDunService.selectListNewOrderDun(OrderNo));
 		return res;
 	}	
 }

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

@@ -4,24 +4,24 @@ 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,"知识产权-公示"),
+	CGZH_SQ(11,"成果转化-首期"),
+	CGZH_WC(12,"成果转化-完成"),
+	COMMON_SQ(21,"通用-首期"),
+	COMMON_NGS(22,"通用-拟公示"),
+	COMMON_XZ(23,"通用-下证"),
+	KJXM_SQ(31,"科技项目-首期"),
+	KJXM_LX(32,"科技项目-立项(公示)"),
+	KJXM_BK(33,"科技项目-拨款"),
+	KJJR_SQ(41,"科技金融-首期"),
+	KJJR_BK(42,"科技金融-拨款"),
+	CS_SQ(51,"财税-首期"),
+	CS_DQ(52,"财税-到期"),
+	HY_SQ(61,"会员-首期"),
+	HY_DQ(62,"会员-到期"),
+	RJKF_SQ(71,"软件开发-首期"),
+	RJKF_WZ(72,"软件开发-完成"),
+	ZSCQ_SQ(81,"知识产权-首期"),
+	ZSCQ_GS(82,"知识产权-公示"),
 	INVALID(99,"未知");
 	
 	private NewOrderDunType(Integer code, String desc) {