Browse Source

Merge branch 'test' of jishutao/kede-server into prod

gitadmin 7 years ago
parent
commit
011acc397f

+ 4 - 0
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -344,6 +344,10 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 		if (StringUtils.isNotBlank(roleName)) params.put("roleName", roleName);
 		params.put("aid", TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
 		Pagination<AdminListBo> p = (Pagination<AdminListBo>)findPage("frequentContactsList", "frequentContactsCount", params, pageNo, pageSize);
+		List<AdminListBo> list=(List<AdminListBo>)p.getList();
+		for(AdminListBo i:list){
+			i.setRoles(adminMapper.selectRolesByUid(i.getContactId()));
+		}
 		return p;
 	}
 

+ 2 - 2
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -225,11 +225,11 @@ public class WebpageController extends BaseController {
 	 */
 	@RequestMapping(value = "/portal/index", method = RequestMethod.GET)
 	public ModelAndView portalIndex(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/index");
+		modelview.setViewName("/admin/login");
 		/*List<Banners> banners = bannersService.findPortalBanners(BannersType.SHOU_YE.getKey());
 		if (!banners.isEmpty()) {
 			modelview.addObject("banner", banners.get(0));
-		}*/
+		}
 		//政策
 		modelview.addObject("jtdt", newsService.findIndexNewsList(0, NewsType.JTDT.getCode(), 4));
 		//服务项目

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

@@ -997,7 +997,7 @@
   </insert>
   
    <select id="frequentContactsList" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.AdminListBo">
-  	 select a.id,b.id as contactId,b.name,b.position,b.contact_mobile as contactMobile,c.name as departmentName
+  	 select a.id,b.id as contactId,b.name,b.position,b.contact_mobile as contactMobile,c.name as departmentName,y.role_name as roleName
     from admin_contacts a left join admin b 
     on a.contacts_id=b.id left join department c 
     on c.id=b.department_id left join user_role x on x.uid=b.id

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

@@ -847,7 +847,7 @@
   	<if test='o.startTime != null and o.startTime != "" and o.endTime != null and o.endTime != ""'>
   	<bind name="a" value="o.startTime + ' 00:00:00'"/>
   	<bind name="b" value="o.endTime + ' 23:59:59'"/>
-  	and o.sign_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
+  	and o.create_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
   	</if>
   	union 
 	select o.order_no as orderNo, o.order_type orderType, o.create_time as createTime, o.process_status as processStatus, 
@@ -870,14 +870,14 @@
   	<if test='o.startTime != null and o.startTime != "" and o.endTime != null and o.endTime != ""'>
   	<bind name="a" value="o.startTime + ' 00:00:00'"/>
   	<bind name="b" value="o.endTime + ' 23:59:59'"/>
-  	and o.sign_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
+  	and o.create_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
   	</if>
 )oo
   	<if test="ob == 1">
-  	order by oo.signTime desc
+  	order by oo.createTime desc
   	</if>
   	<if test="ob == 2">
-  	order by oo.liquidation_status,oo.signTime desc
+  	order by oo.liquidation_status,oo.createTime desc
   	</if>
 	<if test="page_sql != null">
 		${page_sql}
@@ -909,7 +909,7 @@
   	<if test='o.startTime != null and o.startTime != "" and o.endTime != null and o.endTime != ""'>
   	<bind name="a" value="o.startTime + ' 00:00:00'"/>
   	<bind name="b" value="o.endTime + ' 23:59:59'"/>
-  	and o.sign_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
+  	and o.create_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
   	</if>
   	union 
 	select o.order_no as orderNo, o.order_type orderType, o.create_time as createTime, o.process_status as processStatus, 
@@ -932,7 +932,7 @@
   	<if test='o.startTime != null and o.startTime != "" and o.endTime != null and o.endTime != ""'>
   	<bind name="a" value="o.startTime + ' 00:00:00'"/>
   	<bind name="b" value="o.endTime + ' 23:59:59'"/>
-  	and o.sign_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
+  	and o.create_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
   	</if>
 )oo
   </select>
@@ -1012,7 +1012,7 @@
   select  o.order_no as orderNo, o.sign_time as signTime, u.nickname as buyerName, o.order_status as orderStatus, 
   a.name as sellerName, o.salesman_id as sellerId, o.buyer_id as buyerId, o.liquidation_status as liquidationStatus , 
   ifnull(b.amount,0) as actuallyTotalAmount, o.contract_no as contractNo,
-  o.first_amount as signFirstPayment, o.total_amount as signTotalAmount,
+  o.first_amount as signFirstPayment, o.total_amount as signTotalAmount,o.create_time as createTime,
   0 as companyId, "湖南科德信息咨询有限公司" as companyName
   	 from t_order_new o 
   	 left join `user` u on o.buyer_id = u.id 
@@ -1045,7 +1045,7 @@
 	  	<if test='o.startTime != null and o.startTime != "" and o.endTime != null and o.endTime != ""'>
 	  	<bind name="a" value="o.startTime + ' 00:00:00'"/>
 	  	<bind name="b" value="o.endTime + ' 23:59:59'"/>
-	  	and o.sign_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
+	  	and o.create_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
 	  	</if>
 	  	order by o.liquidation_status, o.sign_time desc
 	  	<if test="page_sql != null">
@@ -1085,7 +1085,7 @@
 	  	<if test='o.startTime != null and o.startTime != "" and o.endTime != null and o.endTime != ""'>
 	  	<bind name="a" value="o.startTime + ' 00:00:00'"/>
 	  	<bind name="b" value="o.endTime + ' 23:59:59'"/>
-	  	and o.sign_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
+	  	and o.create_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
 	  	</if>
   </select>
   <!-- 通过订单编号获得订单的负责人(营销员) -->
@@ -1169,7 +1169,7 @@
   	and dep.id = #{depId,jdbcType=VARCHAR}
   	</if>
   	<if test="starTime !=null and endTime !=null">
-  	and a.sign_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+  	and a.create_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
   	order by 
   	<if test="specially == 4">
@@ -1247,7 +1247,7 @@
   	and a.order_no = #{orderNo,jdbcType=VARCHAR}
   	</if>
   	<if test="starTime !=null and endTime !=null">
-  	and a.sign_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+  	and a.create_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
   </select>
   

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

@@ -248,7 +248,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * 订单审核
 	 */
 	@RequestMapping(value="/auditOrderNew", method = RequestMethod.POST)
-	public Result auditOrderNewList(String orderNo,Integer orderStatus,String reason){
+	public Result auditOrderNew(String orderNo,Integer orderStatus,String reason){
 		Result res=new Result();
 		if(StringUtils.isBlank(orderNo)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "订单编号","订单编号"));

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

@@ -393,7 +393,7 @@ public class AdminOrderApiController extends CertifyApiController {
 
 	/** 图片上传 **/
 	@RequestMapping(value = "/uploadOrderImg", method = RequestMethod.POST)
-	public Result uploadCustomerImg(HttpServletRequest req,String sign){
+	public Result uploadOrderImg(HttpServletRequest req,String sign){
 		Result res = new Result();
 		res.setData(handleFile(res, "/order_file/", false, req, sign));
 		return res;

+ 4 - 1
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -255,7 +255,10 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		//这里的已收金额是以前收的所有金额加上本次收的金额
 		orderNew.setSettlementAmount(billNew.getTransactionAmount().add(o.getSettlementAmount()));
 		orderNew.setLiquidationStatus(lstaus);
-		if((lstaus == LiquidationNewState.WAIT_PAY_LAST_BALANCE.getCode() || lstaus == LiquidationNewState.ALREADY_PAY.getCode()) && o.getProcessStatus() == ProcessStatus.YPCWZY.getCode()){//流程状态是3,结算是付款的话
+		if((lstaus == LiquidationNewState.WAIT_PAY_LAST_BALANCE.getCode() 
+				|| lstaus == LiquidationNewState.ALREADY_PAY.getCode()) 
+					&& o.getProcessStatus() < ProcessStatus.YPCWZY.getCode()){
+			//流程状态是3,结算是付款的话
 			orderNew.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());//4
 		}
 		if(result > 0){

+ 4 - 2
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -639,8 +639,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			}
 			//发送驳回邮件
 			EmailBo bo = new EmailBo(tite, b.getEmail(), b.getSalesmanName(), a.getDepartmentName(), a.getName(), content);
-			LoggerUtils.debug(logger, "tite:"+tite+"  Email:"+ b.getEmail()+"  收件人姓名:"+ b.getSalesmanName()+ "    部门:"+a.getDepartmentName()+ "  发件人姓名:"+a.getName()+"   内容:"+ content);
-			SendEmailUtil.getInstance().send(bo);
+			if(StringUtils.isNotBlank(b.getEmail())) {
+				LoggerUtils.debug(logger, "tite:"+tite+"  Email:"+ b.getEmail()+"  收件人姓名:"+ b.getSalesmanName()+ "    部门:"+a.getDepartmentName()+ "  发件人姓名:"+a.getName()+"   内容:"+ content);
+				SendEmailUtil.getInstance().send(bo);
+			}
 			LoggerUtils.debug(logger, "=========================================发送邮件成功");
 	}
 

+ 7 - 6
src/main/resources/props/config_local.properties

@@ -1,7 +1,7 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #\u6570\u636e\u5e93\u94fe\u63a5\uff0c
-jdbc.url=jdbc\:mysql\://192.168.0.198\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
+jdbc.url=jdbc\:mysql\://192.168.0.99\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
 #\u5e10\u53f7
 jdbc.username=dev
 #\u5bc6\u7801
@@ -40,7 +40,7 @@ jdbc.filters=stat
 
 logging.level.com.goafanti=DEBUG
 
-jedis.host=192.168.0.198
+jedis.host=192.168.0.99
 jedis.port=6379
 jedis.timeout=5000
 jedis.password=aft123456
@@ -54,14 +54,15 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-#static.host=//sb.jishutao.com/1.0.50
-#static.host=//static.kedexinxi.com/1.0.50
-static.host=//s.kedexinxi.com/1.0.92
+static.host=//sb.jishutao.com/1.0.50
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.host=//sb.jishutao.com
-#avatar.host=//static.kedexinxi.com
 avatar.upload.host=//sb.jishutao.com/upload
 
+#本地连生产
+#avatar.host=//static.kedexinxi.com
+#static.host=//s.kedexinxi.com/1.0.92
+
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload
 

+ 9 - 16
src/main/webapp/WEB-INF/views/common.html

@@ -11,14 +11,13 @@
 <meta name="viewport"
 	content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1,user-scalable=no">
 <meta http-equiv="x-ua-compatible" content="ie=edge">
-<title>技淘--我的技术和科技服务交易平台</title>
+<title>科德项目管理系统</title>
 <th:block th:replace="${link}" />
 <body>
 	<th:block th:fragment="nav(mainM,subM)">
 		<div class="container">
 			<div class="logo">
-				<a th:href="${basePath + '/portal/index.html'}"> <img
-					th:src="${portalHost+'/img/Logo111.png'}" alt="" title="技淘" />
+				<a th:href="${basePath + '/portal/index.html'}"> <img th:src="${portalHost+'/img/Logo111.png'}" alt="" title="技淘" />
 				</a>
 			</div>
 			<div class="logo_right"></div>
@@ -28,27 +27,21 @@
 						th:href="${basePath + '/portal/service/serviceIndex.html'}">科技服务</a>
 						<img th:src="${portalHost+'/img/hot.png'}" />
 						<ol class="subnavigation">
-							<li><a
-								th:href="${basePath + '/portal/service/highTechCognizance.html'}">高企认定</a>
+							<li><a th:href="${basePath + '/portal/service/highTechCognizance.html'}">高企认定</a>
 							</li>
-							<li><a
-								th:href="${basePath + '/portal/service/propertyRight.html'}">知识产权</a>
+							<li><a th:href="${basePath + '/portal/service/propertyRight.html'}">知识产权</a>
 							</li>
 						</ol></li>
 					<li th:classappend="${mainM=='technologyTrading'}? 'active'">
 						<a th:href="${basePath + '/portal/technologyTrading/index.html'}">技术交易</a>
 						<ol class="subnavigation">
-							<li><a
-								th:href="${basePath + '/portal/technologyTrading/achievement.html'}">专利产品</a>
+							<li><a th:href="${basePath + '/portal/technologyTrading/achievement.html'}">专利产品</a>
 							</li>
-							<li><a
-								th:href="${basePath + '/portal/technologyTrading/achievement.html'}">技术成果</a>
+							<li><a th:href="${basePath + '/portal/technologyTrading/achievement.html'}">技术成果</a>
 							</li>
-							<li><a
-								th:href="${basePath + '/portal/technologyTrading/demand.html'}">技术需求</a>
+							<li><a th:href="${basePath + '/portal/technologyTrading/demand.html'}">技术需求</a>
 							</li>
-							<li><a
-								th:href="${basePath + '/portal/technologyTrading/assessMent.html'}">技术评估</a>
+							<li><a th:href="${basePath + '/portal/technologyTrading/assessMent.html'}">技术评估</a>
 							</li>
 						</ol>
 					</li>
@@ -117,7 +110,7 @@
 				class="glyphicon glyphicon-chevron-right"></span></a>
 		</div>
 		<div class="banner-item" th:if="${banners!=null && banners.size()==1}">
-			<img th:src="${staticDomain +'/upload'+  banners[0].imgurl}"
+			<img th:src="${staticDomain +'/upload'+ banners[0].imgurl}"
 				th:alt="${banners[0].text}">
 		</div>
 	</th:block>