anderx преди 3 години
родител
ревизия
aec5e4c38e

+ 58 - 58
src/main/java/com/goafanti/RD/bo/InputExcelRdDetails.java

@@ -41,13 +41,13 @@ public class InputExcelRdDetails  extends InputRdDetails{
      * 开始时间
      */
     @Excel(name="开始时间")
-    private Date rdStart;
+    private String  rdStartStr;
 
     /**
      * 结束时间
      */
     @Excel(name="结束时间")
-    private Date rdEnd;
+    private String  rdEndStr;
 
 
     /**
@@ -101,142 +101,142 @@ public class InputExcelRdDetails  extends InputRdDetails{
 
 
     @Override
-    public String getConsultantName() {
-        return consultantName;
+    public String getUserName() {
+        return userName;
     }
 
     @Override
-    public void setConsultantName(String consultantName) {
-        this.consultantName = consultantName;
+    public void setUserName(String userName) {
+        this.userName = userName;
     }
 
     @Override
-    public String getTechnicalField() {
-        return technicalField;
+    public String getRdNo() {
+        return rdNo;
     }
 
     @Override
-    public void setTechnicalField(String technicalField) {
-        this.technicalField = technicalField;
+    public void setRdNo(String rdNo) {
+        this.rdNo = rdNo;
     }
 
     @Override
-    public String getTechnologySource() {
-        return technologySource;
+    public String getIpNo() {
+        return ipNo;
     }
 
     @Override
-    public void setTechnologySource(String technologySource) {
-        this.technologySource = technologySource;
+    public void setIpNo(String ipNo) {
+        this.ipNo = ipNo;
     }
 
     @Override
-    public BigDecimal getTotalAmount() {
-        return totalAmount;
+    public String getRdName() {
+        return rdName;
     }
 
     @Override
-    public void setTotalAmount(BigDecimal totalAmount) {
-        this.totalAmount = totalAmount;
+    public void setRdName(String rdName) {
+        this.rdName = rdName;
     }
 
     @Override
-    public BigDecimal getRecentThreeAmount() {
-        return recentThreeAmount;
+    public String getRdStartStr() {
+        return rdStartStr;
     }
 
     @Override
-    public void setRecentThreeAmount(BigDecimal recentThreeAmount) {
-        this.recentThreeAmount = recentThreeAmount;
+    public void setRdStartStr(String rdStartStr) {
+        this.rdStartStr = rdStartStr;
     }
 
     @Override
-    public String getRdObjective() {
-        return rdObjective;
+    public String getRdEndStr() {
+        return rdEndStr;
     }
 
     @Override
-    public void setRdObjective(String rdObjective) {
-        this.rdObjective = rdObjective;
+    public void setRdEndStr(String rdEndStr) {
+        this.rdEndStr = rdEndStr;
     }
 
     @Override
-    public String getCoreTechnology() {
-        return coreTechnology;
+    public String getTechnicalField() {
+        return technicalField;
     }
 
     @Override
-    public void setCoreTechnology(String coreTechnology) {
-        this.coreTechnology = coreTechnology;
+    public void setTechnicalField(String technicalField) {
+        this.technicalField = technicalField;
     }
 
     @Override
-    public String getAchieveResults() {
-        return achieveResults;
+    public String getTechnologySource() {
+        return technologySource;
     }
 
     @Override
-    public void setAchieveResults(String achieveResults) {
-        this.achieveResults = achieveResults;
+    public void setTechnologySource(String technologySource) {
+        this.technologySource = technologySource;
     }
 
     @Override
-    public Date getRdStart() {
-        return rdStart;
+    public BigDecimal getTotalAmount() {
+        return totalAmount;
     }
 
     @Override
-    public void setRdStart(Date rdStart) {
-        this.rdStart = rdStart;
+    public void setTotalAmount(BigDecimal totalAmount) {
+        this.totalAmount = totalAmount;
     }
 
     @Override
-    public Date getRdEnd() {
-        return rdEnd;
+    public BigDecimal getRecentThreeAmount() {
+        return recentThreeAmount;
     }
 
     @Override
-    public void setRdEnd(Date rdEnd) {
-        this.rdEnd = rdEnd;
+    public void setRecentThreeAmount(BigDecimal recentThreeAmount) {
+        this.recentThreeAmount = recentThreeAmount;
     }
 
     @Override
-    public String getUserName() {
-        return userName;
+    public String getRdObjective() {
+        return rdObjective;
     }
 
     @Override
-    public void setUserName(String userName) {
-        this.userName = userName;
+    public void setRdObjective(String rdObjective) {
+        this.rdObjective = rdObjective;
     }
 
     @Override
-    public String getRdNo() {
-        return rdNo;
+    public String getCoreTechnology() {
+        return coreTechnology;
     }
 
     @Override
-    public void setRdNo(String rdNo) {
-        this.rdNo = rdNo;
+    public void setCoreTechnology(String coreTechnology) {
+        this.coreTechnology = coreTechnology;
     }
 
     @Override
-    public String getIpNo() {
-        return ipNo;
+    public String getAchieveResults() {
+        return achieveResults;
     }
 
     @Override
-    public void setIpNo(String ipNo) {
-        this.ipNo = ipNo;
+    public void setAchieveResults(String achieveResults) {
+        this.achieveResults = achieveResults;
     }
 
     @Override
-    public String getRdName() {
-        return rdName;
+    public String getConsultantName() {
+        return consultantName;
     }
 
     @Override
-    public void setRdName(String rdName) {
-        this.rdName = rdName;
+    public void setConsultantName(String consultantName) {
+        this.consultantName = consultantName;
     }
 }

+ 20 - 20
src/main/java/com/goafanti/RD/bo/OutRdDetails.java

@@ -6,40 +6,40 @@ public class OutRdDetails extends RdDetails {
 
 
 
-    private String rdEndS;
-    private String rdStartS;
-    private String openTimeS;
-    private String createTimeS;
+    private String rdEndStr;
+    private String rdStartStr;
+    private String openTimeStr;
+    private String createTimeStr;
 
-    public String getRdEndS() {
-        return rdEndS;
+    public String getRdEndStr() {
+        return rdEndStr;
     }
 
-    public void setRdEndS(String rdEndS) {
-        this.rdEndS = rdEndS;
+    public void setRdEndStr(String rdEndStr) {
+        this.rdEndStr = rdEndStr;
     }
 
-    public String getRdStartS() {
-        return rdStartS;
+    public String getRdStartStr() {
+        return rdStartStr;
     }
 
-    public void setRdStartS(String rdStartS) {
-        this.rdStartS = rdStartS;
+    public void setRdStartStr(String rdStartStr) {
+        this.rdStartStr = rdStartStr;
     }
 
-    public String getOpenTimeS() {
-        return openTimeS;
+    public String getOpenTimeStr() {
+        return openTimeStr;
     }
 
-    public void setOpenTimeS(String openTimeS) {
-        this.openTimeS = openTimeS;
+    public void setOpenTimeStr(String openTimeStr) {
+        this.openTimeStr = openTimeStr;
     }
 
-    public String getCreateTimeS() {
-        return createTimeS;
+    public String getCreateTimeStr() {
+        return createTimeStr;
     }
 
-    public void setCreateTimeS(String createTimeS) {
-        this.createTimeS = createTimeS;
+    public void setCreateTimeStr(String createTimeStr) {
+        this.createTimeStr = createTimeStr;
     }
 }

+ 2 - 2
src/main/java/com/goafanti/RD/service/impl/RDServiceImpl.java

@@ -72,10 +72,10 @@ public class RDServiceImpl extends BaseMybatisDao<RdDetailsMapper> implements RD
     }
 
     @Override
-    public Object list(InputRdList in) {
+    public Pagination<InputExcelRdDetails> list(InputRdList in) {
         Map<String, Object> param = getParam(in);
 
-        return findPage("RdDetailsList","RdDetailsCount",param,in.getPageNo(), in.getPageSize());
+        return (Pagination<InputExcelRdDetails>) findPage("RdDetailsList","RdDetailsCount",param,in.getPageNo(), in.getPageSize());
     }
 
     private Map<String, Object> getParam(InputRdList in) {

+ 0 - 1
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -787,5 +787,4 @@ public class PublicController extends CertifyApiController {
 
 
 
-
 }

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

@@ -120,11 +120,17 @@ public class WebpageController extends BaseController {
 	}
 
 
-	@RequestMapping(value = "/admin/RDlogin", method = RequestMethod.GET)
+	@RequestMapping(value = "/RD/admin/login", method = RequestMethod.GET)
 	public String adminRDLogin(HttpServletRequest request, ModelAndView modelview) {
 		return "/admin/RDlogin";
 	}
 
+	@RequestMapping(value = "/RD/admin/index", method = RequestMethod.GET)
+	public ModelAndView adminRDindex(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/admin/RDindex");
+		return modelview;
+	}
+
 	@RequestMapping(value = "/admin/demand", method = RequestMethod.GET)
 	public String adminDemand(HttpServletRequest request, ModelAndView modelview) {
 		return "/admin/demand";
@@ -204,11 +210,7 @@ public class WebpageController extends BaseController {
 		modelview.setViewName("/admin/index");
 		return modelview;
 	}
-	@RequestMapping(value = "/admin/RDindex", method = RequestMethod.GET)
-	public ModelAndView adminRDindex(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/admin/RDindex");
-		return modelview;
-	}
+
 	@RequestMapping(value = "/admin/amiba", method = RequestMethod.GET)
 	public ModelAndView adminAmiba(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/admin/amiba");

+ 3 - 3
src/main/java/com/goafanti/common/mapper/RdDetailsMapper.xml

@@ -285,9 +285,9 @@
      a.id, a.user_name userName, a.rd_no rdNo, a.ip_no ipNo, a.rd_name rdName,a.technical_field technicalField,
     a.technology_source technologySource, a.total_amount totalAmount, a.recent_three_amount recentThreeAmount,a.aid,
      a.rd_objective rdObjective, a.core_technology coreTechnology, a.achieve_results achieveResults,a.consultant_name consultantName,
-    a.status,a.browse_count browseCount ,a.download_count downloadCount, date_format(a.rd_start, '%Y-%m-%d %H:%i:%s') rdStartS,
-     date_format(a.rd_end , '%Y-%m-%d %H:%i:%s') rdEndS,date_format(a.open_time, '%Y-%m-%d %H:%i:%s')openTimeS,
-     date_format(a.create_time, '%Y-%m-%d %H:%i:%s') createTimeS
+    a.status,a.browse_count browseCount ,a.download_count downloadCount, date_format(a.rd_start, '%Y-%m-%d') rdStartStr,
+     date_format(a.rd_end , '%Y-%m-%d') rdEndStr,date_format(a.open_time, '%Y-%m-%d %H:%i:%s')openTimeStr,
+     date_format(a.create_time, '%Y-%m-%d %H:%i:%s') createTimeStr
   </sql>
   <select id="details" resultType="com.goafanti.RD.bo.OutRdDetails">
     select

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

@@ -53,7 +53,7 @@ amb.maxLvl=6
 
 avatar.host=//static.jishutao.com
 static.host=//static.jishutao.com/1.2.57
-rd.static.host=http://172.16.1.187/1.2.57
+rd.static.host=//static.jishutao.com/RD/1.0.00
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.14
 #static.host=http://172.16.1.187/prod/1.2.25

+ 2 - 0
src/main/resources/shiro_base_auth.ini

@@ -8,6 +8,8 @@
 /user/signIn=anon
 /admin/login=anon
 /admin/login.html=anon
+/RD/admin/login=anon
+/RD/admin/index=admin
 /mlogin=anon
 /signin=anon
 /managesignin=anon

+ 1 - 0
src/main/webapp/WEB-INF/views/admin/RDindex.html

@@ -3,6 +3,7 @@
 	xmlns:th="http://www.thymeleaf.org">
 <head th:replace="common::header(~{::title},~{::link})">
 	<title>管理中心首页</title>
+	<link rel="icon" th:href="${rdStaticHost+'/image/logo.png'}">
 	<link th:href="${rdStaticHost+'/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${rdStaticHost+'/admin/index.css'}" rel="stylesheet">
 </head>

+ 1 - 0
src/main/webapp/WEB-INF/views/admin/RDlogin.html

@@ -3,6 +3,7 @@
 	xmlns:th="http://www.thymeleaf.org">
 <head th:replace="common::header(~{::title},~{::link})">
 	<title>登录页</title>
+	<link rel="icon" th:href="${rdStaticHost+'/image/logo.png'}">
 	<link th:href="${rdStaticHost+'/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${rdStaticHost+'/admin/login.css'}" rel="stylesheet">
 </head>