代码提交-glj

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

@@ -2,10 +2,8 @@ package com.kening.vordm.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.protostuff.runtime.ArraySchemas;
 import lombok.Data;
 import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.core.secure.BladeUser;
 
 import java.util.Date;
 

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

@@ -0,0 +1,42 @@
+package com.kening.vordm.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * @TableName serial_number
+ */
+@TableName(value ="serial_number")
+@Data
+public class SerialNumber implements Serializable {
+    /**
+     *
+     */
+    @TableId
+    private Integer id;
+
+    /**
+     *
+     */
+    private Integer number;
+
+    /**
+     *
+     */
+    private String type;
+
+    /**
+     *
+     */
+    private Date operateTime;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+}

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

@@ -57,4 +57,14 @@ public class CallForHelpVo extends DisasterInfo {
 	 * 名字
 	 */
 	private String firstName;
+
+	/**
+	 * 职业
+	 */
+	private String occupation;
+
+	/**
+	 * 受灾国家
+	 */
+	private String disasterCountry;
 }

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

@@ -41,6 +41,10 @@ public class AdminManagerController {
 	 */
 	@PostMapping("/audit")
 	public R audit(@RequestBody List<GuestManageDisasterRef> guestManageDisasterRef){
+
+
+
+
 		return R.status(guestManageDisasterRefService.updateBatchById(guestManageDisasterRef));
 	}
 }

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

@@ -52,6 +52,10 @@ public class DisasterInfoController {
 
 	private final DisasterInfoVoService disasterInfoVoService;
 
+	/**
+	 * 编号生成
+	 */
+	private final SerialNumberService serialNumberService;
 
 	@GetMapping("/saveGuestManageDisasterRef")
 	public R saveGuestManageDisasterRef(Long disasterId, Long managerId) {
@@ -322,20 +326,33 @@ public class DisasterInfoController {
 	 */
 	@PostMapping("Call-for-help")
 	public R<Boolean> insertRespondInfo(@RequestBody CallForHelpVo callForHelpVo) {
+		LambdaQueryWrapper<GuestInfo> qw = new LambdaQueryWrapper<>();
+		qw.eq(GuestInfo::getEmail,callForHelpVo.getEmail());
+		GuestInfo one = guestInfoService.getOne(qw);
+
 		GuestInfo guestInfo = new GuestInfo();
 		BeanUtil.copyProperties(callForHelpVo, guestInfo);
+		Boolean flag1 = false;
+		if (one==null){
 			guestInfo.setId(IdWorker.getId());
+			flag1 = guestInfoService.save(guestInfo);
+		}else {
+			guestInfo.setId(one.getId());
+			flag1 =guestInfoService.updateById(guestInfo);
+		}
+
 		DisasterInfo disasterInfo = new DisasterInfo();
 		BeanUtil.copyProperties(callForHelpVo, disasterInfo);
-		disasterInfo.setId(IdWorker.getId());
 		disasterInfo.setUploadTime(new Date());
-		GuestManageDisasterRef GuestManageDisasterRef = new GuestManageDisasterRef();
-		GuestManageDisasterRef.setId(IdWorker.getId());
-		GuestManageDisasterRef.setSponsorId(guestInfo.getId());
-		GuestManageDisasterRef.setDisasterId(disasterInfo.getId());
-		Boolean flag1 = guestInfoService.save(guestInfo);
-		Boolean flag2 = guestManageDisasterRefService.save(GuestManageDisasterRef);
 		Boolean flag3 = disasterInfoService.save(disasterInfo);
+
+
+		GuestManageDisasterRef guestManageDisasterRef = new GuestManageDisasterRef();
+		guestManageDisasterRef.setSponsorId(guestInfo.getId());
+		guestManageDisasterRef.setDisasterId(disasterInfo.getId());
+		guestManageDisasterRef.setApplyTime(new Date());
+		Boolean flag2 = guestManageDisasterRefService.save(guestManageDisasterRef);
+
 		Boolean callForHelp = flag1 && flag2 && flag3;
 		return R.data(callForHelp);
 	}
@@ -343,6 +360,12 @@ public class DisasterInfoController {
 
 	@PostMapping("review")
 	public R<Boolean> review(@RequestBody DisasterInfo disasterInfo) {
+
+		//审批通过
+		if (disasterInfo.getRespondStatus() == 2){
+			String numbering = serialNumberService.generateNumbering(disasterInfo.getDisasterType());
+			disasterInfo.setVordmId(numbering);
+		}
 		Boolean flag = disasterInfoService.updateById(disasterInfo);
 		return R.data(flag);
 	}

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

@@ -11,6 +11,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;
 
 @RestController
@@ -52,10 +53,12 @@ public class EntityDataController {
 	}
 
 	@GetMapping("/updateByIdEntityDataStatus")
-	public R updateByIdEntityDataStatus(Long id,Integer status) {
+	public R updateByIdEntityDataStatus(Long id,Integer status,Long managerId) {
 		EntityData entityData = new EntityData();
 		entityData.setId(id);
 		entityData.setStatus(status);
+		entityData.setManagerId(managerId);
+		entityData.setReviewTime(new Date());
 		return R.data(entityDataService.updateById(entityData));
 	}
 }

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

@@ -77,7 +77,6 @@
             <if test="id != null and id != ''">
                 di.id = #{id}
             </if>
-                and gmdr.STATUS != 2
         </where>
     </select>
 

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

@@ -0,0 +1,16 @@
+package com.kening.vordm.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kening.vordm.entity.SerialNumber;
+
+/**
+* @author G1393
+* @description 针对表【serial_number】的数据库操作Mapper
+* @createDate 2023-04-21 11:22:19
+* @Entity new.domain.SerialNumber
+*/
+public interface SerialNumberMapper extends BaseMapper<SerialNumber> {
+
+
+}

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kening.vordm.mapper.SerialNumberMapper">
+
+    <resultMap id="BaseResultMap" type="com.kening.vordm.entity.SerialNumber">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="number" column="number" jdbcType="INTEGER"/>
+            <result property="type" column="type" jdbcType="VARCHAR"/>
+            <result property="operateTime" column="operate_time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,number,type,
+        operate_time
+    </sql>
+</mapper>

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

@@ -24,7 +24,7 @@
     </sql>
     <select id="wordCount" resultType="com.kening.vordm.entity.WorldCharts" parameterType="java.lang.Long">
         select
-               DATE_FORMAT(time,'%Y-%m-%d') date,
+               DATE_FORMAT(create_time,'%Y-%m-%d') date,
                frequency value,
                word name,
                 type

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

@@ -0,0 +1,17 @@
+package com.kening.vordm.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kening.vordm.entity.SerialNumber;
+
+/**
+* @author G1393
+* @description 针对表【serial_number】的数据库操作Service
+* @createDate 2023-04-21 11:22:19
+*/
+public interface SerialNumberService extends IService<SerialNumber> {
+
+
+	String generateNumbering(String disasterType);
+
+}

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

@@ -75,7 +75,6 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
 		//创建实体数据
 		EntityData entityData = new EntityData();
 
-
 		//判断上传用户是否存在
 		LambdaQueryWrapper<GuestInfo> qw = new LambdaQueryWrapper<>();
 		qw.eq(GuestInfo::getEmail, entityDataUserVo.getEmail());
@@ -132,6 +131,8 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
 			entityData.setUploadTime(new Date());
 			entityData.setRemark(entityDataUserVo.getRemark());
 			entityData.setSourceOrganization(entityDataUserVo.getOrganization());
+			entityData.setType(entityDataUserVo.getType());
+			entityData.setTitle(entityDataUserVo.getTitle());
 			return R.status(this.baseMapper.insert(entityData) > 0);
 		}
 	}

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

@@ -0,0 +1,45 @@
+package com.kening.vordm.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kening.vordm.entity.SerialNumber;
+import com.kening.vordm.mapper.SerialNumberMapper;
+import com.kening.vordm.service.SerialNumberService;
+import org.springframework.stereotype.Service;
+
+import java.util.Calendar;
+
+/**
+* @author G1393
+* @description 针对表【serial_number】的数据库操作Service实现
+* @createDate 2023-04-21 11:22:19
+*/
+@Service
+public class SerialNumberServiceImpl extends ServiceImpl<SerialNumberMapper, SerialNumber>
+implements SerialNumberService {
+
+
+	@Override
+	public String generateNumbering(String disasterType) {
+		LambdaQueryWrapper<SerialNumber> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(SerialNumber::getType,disasterType);
+		SerialNumber serialNumber = this.baseMapper.selectOne(queryWrapper);
+		Calendar calendar = Calendar.getInstance();
+		//获取当前年
+		int year = calendar.get(Calendar.YEAR);
+		String num = "";
+		if (serialNumber.getNumber()<10){
+			num = year + disasterType +"000" + serialNumber.getNumber();
+		}else if(serialNumber.getNumber() < 100 && serialNumber.getNumber() > 10 ){
+			num = year + disasterType + "00" + serialNumber.getNumber();
+		}else if(serialNumber.getNumber() < 1000 && serialNumber.getNumber() > 99 ){
+			num = year + disasterType + "0" + serialNumber.getNumber();
+		}else if(serialNumber.getNumber() > 999){
+			num = year + disasterType + serialNumber.getNumber();
+		}
+		serialNumber.setNumber(serialNumber.getNumber()+1);
+		this.baseMapper.updateById(serialNumber);
+		return num;
+	}
+
+}