Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	sql/20200415.sql
#	src/main/java/platform/common/util/CookieUtil.java
#	src/main/java/platform/modules/api/web/FGJFilingController.java
#	src/main/java/platform/modules/sys/service/ApprovalService.java
#	src/main/resources/templates/admin/government/land_statistic/plate.html
#	src/main/resources/templates/home/common/header.html

sql/20200415.sql

@@ -6,4 +6,6 @@
 ALTER TABLE `service_platform`.`ac_activity_detail`
 ADD COLUMN `is_qrcode_show` varchar(2) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '1' COMMENT '是否显示二维码（1是，0否）,默认显示' AFTER `is_review`,
 DROP PRIMARY KEY,
-ADD PRIMARY KEY (`id`) USING BTREE;
+ADD PRIMARY KEY (`id`) USING BTREE;
+
+ALTER TABLE project_application ADD pass varchar(20)  COLLATE utf8_bin COMMENT '通过状态 用于统计首页数量';

src/main/java/platform/common/util/CookieUtil.java

@@ -50,24 +50,6 @@ public class CookieUtil {
         httpServletResponse.addCookie(cookie);
     }
 
-    /**
-     * 添加cookie
-     * @param httpServletResponse
-     * @param name cookie的key
-     * @param value cookie的value
-     * @param secure 表示这个cookie仅在https环境下才能使用
-     * @param maxAge 最长存活时间 单位为秒
-     * @param domain
-     */
-    public static void createWebCookie(HttpServletResponse httpServletResponse, String name, String value, Integer maxAge) {
-        Cookie cookie = new Cookie(name, value);
-        cookie.setHttpOnly(false);
-        cookie.setSecure(false);
-        cookie.setMaxAge(maxAge);
-        cookie.setPath("/");
-        httpServletResponse.addCookie(cookie);
-    }
-
     /**
      * 往根下面存一个cookie
      * * @param name cookie的key

src/main/java/platform/modules/api/web/FGJFilingController.java

@@ -0,0 +1,67 @@
+package platform.modules.api.web;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import platform.modules.api.dto.DepartmentDto;
+import platform.modules.api.dto.UserInfoDto;
+import platform.modules.api.dto.UserRoleDto;
+import platform.modules.api.service.SkyImageApiService;
+import platform.modules.government.entity.User;
+import platform.modules.government.service.UserService;
+import platform.modules.sys.entity.Department;
+import platform.modules.sys.service.DepartmentService;
+import platform.modules.sys.service.UserRoleService;
+import platform.modules.sys.web.ResponseMessage;
+
+import java.util.List;
+
+/**
+ * @author kevin
+ * @since 2019/3/7 9:58 AM
+ */
+@RestController
+//@RequestMapping("/filing/api")
+public class FGJFilingController {
+
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private DepartmentService departmentService;
+
+    @Autowired
+    private UserRoleService userRoleService;
+
+    @GetMapping("/userInfo/getUserInfoList")
+    public Object getUsetList(Integer departmentId){
+        List<UserInfoDto> userList = userService.findAllGovUsers(departmentId);
+
+        return ResponseMessage.success("success", userList);
+    }
+
+    /**
+     * 获取所有用户信息
+     *
+     * @param userType
+     * @return
+     */
+    @GetMapping("/userInfo/allUsers")
+    public Object getUseList(Integer userType){
+        List<UserInfoDto> userList = userService.findAllUsers(userType);
+        return ResponseMessage.success("success", userList);
+    }
+
+    @GetMapping("/department/getDepartmentList")
+    public Object getDepartmentList(){
+        List<DepartmentDto> departments = departmentService.findDepartmentList();
+        return ResponseMessage.success("success", departments);
+    }
+
+    @GetMapping("/userRole/getUserRoleList")
+    public Object getUserRoleList(){
+        List<UserRoleDto> userInfoDtos = userRoleService.findUserRoleList();
+        return ResponseMessage.success("success", userInfoDtos);
+    }
+}

src/main/java/platform/modules/sys/service/ApprovalService.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -125,7 +126,7 @@ public class ApprovalService extends BaseService<Approval> {
     private List<Department> getPendingAuditDepts(Integer apply_id, List<String> userIdArr, List<Approval> approvals) {
         //总共需要审核的部门
         List<Department> allDepts = departmentService.getAllUserDepts(userIdArr);
-        if (approvals.size() == 0){
+        if (approvals.size() == 0) {
             try {
                 throw new Exception("没有审批流程");
             } catch (Exception e) {
@@ -308,6 +309,21 @@ public class ApprovalService extends BaseService<Approval> {
         return approvals;
     }
 
+    //查询流程信息
+    public List<Approval> getApprovalList(Integer apply_id, String dictType, String approveStatusType) {
+        Example example = new Example(Approval.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("apply_id", apply_id);
+        criteria.andEqualTo("type", dictType);
+        List<Approval> approvals = this.selectByExample(example);
+        for (Approval approval : approvals) {
+            if (StringUtils.isNotBlank(approval.getBefore_approvalstatus())) {
+                approval.setBefore_approvalstatus_str(dictionaryItemService.findNameByTypeAndValue(approveStatusType, approval.getBefore_approvalstatus()));
+            }
+        }
+        return approvals;
+    }
+
     public List<CenterBusiness> getCenterBusiness(BusinessSearchDto businessSearchDto) {
         return approvalDao.getCenterBusiness(businessSearchDto);
     }
@@ -355,6 +371,10 @@ public class ApprovalService extends BaseService<Approval> {
         return approvalDao.getBusinessAcceptNum(businessSearchDto);
     }
 
+    public List<Approval> selectAllApproval(String type) {
+        return approvalDao.selectAllApproval(type);
+    }
+
     /**
      * 获取流程信息
      *

src/main/resources/templates/admin/government/land_statistic/plate.html

@@ -25,7 +25,7 @@
 
         .chartContent .chartLi {
             float: left;
-            height: 200px;
+            height: 300px;
             box-sizing: border-box;
         }
 
@@ -206,9 +206,6 @@
     <!--    <span class="plate_tab_item">综合保税区</span>-->
     <!--    <span class="plate_tab_item">度假区(含镇湖)</span>-->
     <!--    <span class="plate_tab_item">区外</span>-->
-</div>
-<div class="chartContent">
-
 </div>
 <div class="chartContent">
     <div class="title">当前审核状态统计</div>
@@ -228,9 +225,6 @@
     <input class="Wdate input-text" type="text" th:id="daily_monthly_end_time" th:name="daily_monthly_end_time"
            style="float:left; width: 150px;"
            onclick="WdatePicker({dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'daily_monthly_start_time\')}',isShowClear:true,readOnly:true,onpicked: function(){invokeGetDailyStatisticAndGetTypeStatistic()} })"/>
-</div>
-<div class="chartContent">
-
 </div>
 <div class="chartContent">
     <div class="title">每日统计</div>
@@ -433,6 +427,7 @@
 
         // 指定图表的配置项和数据
         var option = {
+            color: ['#61A5E8', '#EECB5F'],
             title: {
                 text: title,
                 textStyle: {
@@ -450,7 +445,6 @@
                 bottom: 10,
                 data: legendData
             },
-            color: ['#61A5E8','#EECB5F'],
             series: [
                 {
                     name: title,
@@ -502,6 +496,7 @@
 
         // 指定图表的配置项和数据
         option = {
+            color: ['#61A5E8'],
             title: {
                 text: title,
                 textStyle: {
@@ -509,7 +504,6 @@
                     fontWeight: 'bold'
                 }
             },
-            color: ['#3398DB'],
             tooltip: {
                 trigger: 'axis',
                 axisPointer: {            // 坐标轴指示器，坐标轴触发有效
@@ -565,6 +559,7 @@
 
         // 指定图表的配置项和数据
         var option = {
+            color: ['#7ECF51', '#B9646E', '#E3935D'],
             title: {
                 text: title,
                 textStyle: {
@@ -582,7 +577,6 @@
                 bottom: 10,
                 data: legendData
             },
-            color: ['#7ECF51', '#B9646E', '#E3935D'],
             series: [
                 {
                     name: title,
@@ -632,6 +626,7 @@
 
         // 指定图表的配置项和数据
         option = {
+            color: ['#61A5E8', '#7ECF51', '#B9464E', '#E3935D'],
             // title: {
             //     text: '折线图堆叠'
             // },
@@ -641,7 +636,6 @@
             legend: {
                 data: legendData
             },
-            color: ['#61A5E8', '#E3935D', '#7ECF51', '#B9646E'],
             grid: {
                 left: '3%',
                 right: '4%',
@@ -674,7 +668,7 @@
 
         // 指定图表的配置项和数据
         option = {
-            color: ['#61A5E8', '#E3935D', '#7ECF51', '#B9646E'],
+            color: ['#61A5E8', '#E3935D', '#7ECF51', '#B9464E'],
             tooltip: {
                 trigger: 'axis',
                 axisPointer: {

src/main/resources/templates/home/common/header.html

@@ -106,7 +106,7 @@
 							<a onclick="checkLogin1('azw')" data-title="安专委平台">安专委平台</a>
 							<a onclick="checkLogin1('dljk')" data-title="电炉监控系统">电炉监控系统</a>
 							<a onclick="checkLogin1('lyjj')" data-title="楼宇经济管理平台">楼宇经济管理平台</a>
-							<a onclick="checkLogin1('jwtz')" data-title="境外投资项目备案系统">境外投资项目备案系统</a>
+							<a href="http://escloud.snd.gov.cn/home/serverDetail/78" data-title="境外投资项目备案系统" target="_blank">境外投资项目备案系统</a>
 						</div>
 					</li>
 				</ul>