Commit 1e1d4727 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.7' into MVP1.7.7

parents 4697c4a9 939e6507
...@@ -462,6 +462,7 @@ public class TSettleDomainController { ...@@ -462,6 +462,7 @@ public class TSettleDomainController {
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
e.printStackTrace(); e.printStackTrace();
} }
log.error("jsonStr:"+jsonStr);
List<TDomainUpCsVo> list= JSONObject.parseArray(jsonStr, TDomainUpCsVo.class); List<TDomainUpCsVo> list= JSONObject.parseArray(jsonStr, TDomainUpCsVo.class);
return tSettleDomainService.updateProjectCsInfo(list); return tSettleDomainService.updateProjectCsInfo(list);
} }
......
...@@ -193,7 +193,8 @@ ...@@ -193,7 +193,8 @@
a.NEW_LINE, a.NEW_LINE,
a.DIVISION, a.DIVISION,
a.cs_name, a.cs_name,
a.cs_phone a.cs_phone,
a.cs_login_name
</sql> </sql>
<resultMap id="tSettleDomainSelectVoMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo"> <resultMap id="tSettleDomainSelectVoMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo">
...@@ -232,6 +233,7 @@ ...@@ -232,6 +233,7 @@
<result property="csName" column="cs_name"/> <result property="csName" column="cs_name"/>
<result property="csPhone" column="cs_phone"/> <result property="csPhone" column="cs_phone"/>
<result property="csLoginName" column="cs_login_name"/>
</resultMap> </resultMap>
<select id="getPage" resultMap="tSettleDomainMap"> <select id="getPage" resultMap="tSettleDomainMap">
...@@ -431,7 +433,8 @@ ...@@ -431,7 +433,8 @@
a.NEW_LINE, a.NEW_LINE,
a.DIVISION, a.DIVISION,
a.cs_name, a.cs_name,
a.cs_phone a.cs_phone,
a.cs_login_name
FROM FROM
t_settle_domain a t_settle_domain a
<if test="userId != null and userId.trim() != '-999'"> <if test="userId != null and userId.trim() != '-999'">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment