代码提交

kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java

@@ -2,6 +2,8 @@ package com.kening.vordm.entity;
 
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 返回页面管理员数据实体
  * @author liyuchen
@@ -20,4 +22,8 @@ public class AdminManager extends DisasterInfo{
 	private String occupation;
 
 	private String researchField;
+
+	private Date reviewTime;
+
+	private Date applyTime;
 }

kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java

@@ -82,6 +82,10 @@ public class UserVo {
 	 * 职业
 	 */
 	private String occupation;
+	/**
+	 * 职业
+	 */
+	private String roleId;
 
 
 }

kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java

@@ -9,6 +9,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -32,6 +33,7 @@ public class AdminManagerController {
 	 */
 	@GetMapping("/pages")
 	public R pages(Query query, @RequestParam Map<String,Object> params){
+
 		return R.data(guestManageDisasterRefService.queryPage(Condition.getPage(query),params));
 	}
 
@@ -41,10 +43,9 @@ public class AdminManagerController {
 	 */
 	@PostMapping("/audit")
 	public R audit(@RequestBody List<GuestManageDisasterRef> guestManageDisasterRef){
-
+		guestManageDisasterRef.stream().forEach(guestManageDisasterRef1 -> {
-
+			guestManageDisasterRef1.setReviewTime(new Date());
-
+		});
-
 		return R.status(guestManageDisasterRefService.updateBatchById(guestManageDisasterRef));
 	}
 }

kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml

@@ -46,8 +46,8 @@
     </sql>
 
     <insert id="saveUserData">
-        insert into blade_user (tenant_id, password, email, status, is_deleted)
+        insert into blade_user (tenant_id, password, email, status, is_deleted, role_id)
-        values (#{userVo.tenantId}, #{userVo.password}, #{userVo.email}, 1, 0);
+        values (#{userVo.tenantId}, #{userVo.password}, #{userVo.email}, 1, 0,#{userVo.roleId});
     </insert>
 
     <update id="updataUserByEmail">
@@ -219,9 +219,6 @@
             <if test="email != null and email != ''">
                 email = #{email}
             </if>
-            <if test="callForHelpVo.chiefId != null">
-                d.chief_id = #{callForHelpVo.chiefId}
-            </if>
         </where>
     </select>
 

kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml

@@ -24,6 +24,8 @@
             gmdr.manager_id,
             gmdr.disaster_id,
             gmdr.status,
+            gmdr.review_time,
+            gmdr.apply_time,
             bu.name as managerName,
             bu.research_field as researchField,
             bu.occupation,
@@ -38,7 +40,12 @@
         left join blade_user bu on gmdr.manager_id = bu.id
         left join blade_dict_biz bdb on bdb.dict_key = di.disaster_type
         <where>
-            and gmdr.status = 0
+            <if test="params.status==null and params.status==''">
+                and gmdr.status = 0 or gmdr.status = 1
+            </if>
+            <if test="params.status!=null and params.status!=''">
+                and gmdr.status = #{params.status}
+            </if>
             <if test="params.managerName!=null and params.managerName!=''">
                 and bu.name like concat('%',#{params.managerName},'%')
             </if>

kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java

@@ -172,7 +172,8 @@ public class DisasterInfoServiceImpl extends ServiceImpl<DisasterInfoMapper, Dis
 		}
 
 		//密码
-		userVo.setPassword(DigestUtil.encrypt(userVo.getPassword()));
+		userVo.setPassword(DigestUtil.hex(userVo.getPassword()));
+
 		Integer integer = this.baseMapper.saveUserData(userVo);
 		return R.status(integer > 0);
 	}