Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java

@@ -514,6 +514,7 @@ public class TAbilityApplicationController {
             List<Object> data = new ArrayList<>();
             data.add(index.getOrDefault("resourceName", "") == null ? "" : index.getOrDefault("resourceName", "").toString());
             data.add(index.getOrDefault("resourceType", "") == null ? "" : index.getOrDefault("resourceType", "").toString());
+            data.add(index.getOrDefault("applyResult", "") == null ? "" : index.getOrDefault("applyResult", "").toString());
             data.add(index.getOrDefault("provideDept", "") == null ? "" : index.getOrDefault("provideDept", "").toString());
             data.add(index.getOrDefault("applyDept", "") == null ? "" : index.getOrDefault("applyDept", "").toString());
             data.add(index.getOrDefault("applyDate", "") == null ? "" : index.getOrDefault("applyDate", "").toString());
@@ -536,17 +537,19 @@ public class TAbilityApplicationController {
         String total = "累计节省财政资金约" + priceTotal + "万元";
         List<List<String>> list = new ArrayList<>();
         List<String> head0 = new ArrayList<>(Arrays.asList(total, "资源名称"));
-        List<String> head1 = new ArrayList<>(Arrays.asList(total, "类型"));
+        List<String> head1 = new ArrayList<>(Arrays.asList(total, "资源类型"));
-        List<String> head2 = new ArrayList<>(Arrays.asList(total, "提供部门"));
+        List<String> head2 = new ArrayList<>(Arrays.asList(total, "审核状态"));
-        List<String> head3 = new ArrayList<>(Arrays.asList(total, "申请部门"));
+        List<String> head3 = new ArrayList<>(Arrays.asList(total, "提供部门"));
-        List<String> head4 = new ArrayList<>(Arrays.asList(total, "申请时间"));
+        List<String> head4 = new ArrayList<>(Arrays.asList(total, "申请部门"));
-        List<String> head5 = new ArrayList<>(Arrays.asList(total, "参考价格(元)"));
+        List<String> head5 = new ArrayList<>(Arrays.asList(total, "申请时间"));
+        List<String> head6 = new ArrayList<>(Arrays.asList(total, "参考价格(元)"));
         list.add(head0);
         list.add(head1);
         list.add(head2);
         list.add(head3);
         list.add(head4);
         list.add(head5);
+        list.add(head6);
         return list;
     }
 

renren-admin/src/main/java/io/renren/modules/security/service/impl/SysUserTokenServiceImpl.java

@@ -23,7 +23,6 @@ import java.util.Map;
 @Service
 public class SysUserTokenServiceImpl extends BaseServiceImpl<SysUserTokenDao, SysUserTokenEntity> implements SysUserTokenService {
 
-
     /**
      * 12小时后过期
      */
@@ -33,65 +32,6 @@ public class SysUserTokenServiceImpl extends BaseServiceImpl<SysUserTokenDao, Sy
     @Value("${system.allowSimultaneousLogin}")
     private int allowSimultaneousLogin;
 
-    /*
-    @Override
-    public Result createToken(Long userId) {
-        //用户token
-        String token;
-
-        //当前时间
-        Date now = new Date();
-        //过期时间
-        Date expireTime = new Date(now.getTime() + EXPIRE * 1000);
-        token = TokenGenerator.generateValue();
-
-        SysUserTokenEntity tokenEntity = new SysUserTokenEntity();
-        tokenEntity.setUserId(userId);
-        tokenEntity.setToken(token);
-        tokenEntity.setUpdateDate(now);
-        tokenEntity.setExpireDate(expireTime);
-        //保存token
-        this.insert(tokenEntity);
-//支持单账号多地登录
-        //判断是否生成过token
-//		SysUserTokenEntity tokenEntity = baseDao.getByUserId(userId);
-//		if(tokenEntity == null){
-//			//生成一个token
-//			token = TokenGenerator.generateValue();
-//
-//			tokenEntity = new SysUserTokenEntity();
-//			tokenEntity.setUserId(userId);
-//			tokenEntity.setToken(token);
-//			tokenEntity.setUpdateDate(now);
-//			tokenEntity.setExpireDate(expireTime);
-//
-//			//保存token
-//			this.insert(tokenEntity);
-//		}else{
-//			//判断token是否过期
-////			if(tokenEntity.getExpireDate().getTime() < System.currentTimeMillis()){
-////				//token过期，重新生成token
-////				token = TokenGenerator.generateValue();
-////			}else {
-////				token = tokenEntity.getToken();
-////			}
-//			token = TokenGenerator.generateValue();
-//			tokenEntity.setToken(token);
-//			tokenEntity.setUpdateDate(now);
-//			tokenEntity.setExpireDate(expireTime);
-//
-//			//更新token
-//			this.updateById(tokenEntity);
-//		}
-
-        Map<String, Object> map = new HashMap<>(2);
-        map.put(Constant.TOKEN_HEADER, token);
-        map.put("expire", EXPIRE);
-        return new Result().ok(map);
-    }
-*/
-
-
     @Override
     public Result createToken(Long userId) {
         //用户token

renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml

@@ -356,7 +356,8 @@
         sd.NAME AS "provideDept",
         taa.unit AS "applyDept",
         taa.create_date AS "applyDate",
-        taa.apply_price AS "applyPrice"
+        taa.apply_price AS "applyPrice",
+        taa.approve_status AS "applyResult"
         FROM
         t_ability_application taa
         LEFT JOIN tb_data_resource tdr ON taa.resource_id = tdr.id
@@ -401,7 +402,8 @@
         '青岛市大数据发展管理局' AS "provideDept",
         tmb.dept AS "applyDept",
         tmb.create_date AS "applyDate",
-        tmb.apply_price AS "applyPrice"
+        tmb.apply_price AS "applyPrice",
+        ( CASE tmb.state WHEN 0 THEN '审核中' WHEN 2 THEN '通过' ELSE '审核中' END ) AS "applyResult"
         FROM
         t_meetingroom_book tmb
         LEFT JOIN t_meetingroom tm ON tmb.room_id = tm.id
@@ -529,7 +531,8 @@
         sd.NAME AS "provideDept",
         taa.unit AS "applyDept",
         taa.create_date AS "applyDate",
-        taa.apply_price AS "applyPrice"
+        taa.apply_price AS "applyPrice",
+        taa.approve_status AS "applyResult"
         FROM
         t_ability_application taa
         LEFT JOIN tb_data_resource tdr ON taa.resource_id = tdr.id
@@ -574,7 +577,8 @@
         '青岛市大数据发展管理局' AS "provideDept",
         tmb.dept AS "applyDept",
         tmb.create_date AS "applyDate",
-        tmb.apply_price AS "applyPrice"
+        tmb.apply_price AS "applyPrice",
+        ( CASE tmb.state WHEN 0 THEN '审核中' WHEN 2 THEN '通过' ELSE '审核中' END ) AS "applyResult"
         FROM
         t_meetingroom_book tmb
         LEFT JOIN t_meetingroom tm ON tmb.room_id = tm.id