yaowang
/
kn-vordm
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

完成tool 修复，完成contact 完成 数据审核加入分配

This commit is contained in:
yyhouc 2023-04-19 21:00:42 +08:00
parent 55bbcc2ee0
commit e18b864ee3
9 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Contact.java
View File

@ -63,5 +63,9 @@ public class Contact implements Serializable {
@TableField(exist = false)
private static final long serialVersionUID = 1L;
@TableField(exist = false)
private String verify;
@TableField(exist = false)
private String key;
}

4
kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java
View File

@ -144,4 +144,8 @@ public class DisasterInfo implements Serializable {
@TableField(exist = false)
private static final long serialVersionUID = 1L;
private Long chiefId;
private String chiefName;
}

4
kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Tool.java
View File

@ -85,5 +85,9 @@ public class Tool implements Serializable {
private static final long serialVersionUID = 1L;
@TableField(exist = false)
private String checked;
/**
* 贡献者
*/
private String showName;
}

1
kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ContactController.java
View File

@ -70,6 +70,7 @@ public class ContactController{
@ApiOperation(value = "提交", notes = "传入Contact")
@PostMapping("/submit")
public R submit(@ApiParam(value = "Contact对象", required = true) @RequestBody Contact contact) {
contact.setContactDate(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
return R.status(contactService.saveOrUpdate(contact));
}

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

@ -16,6 +16,7 @@ import com.kening.vordm.vo.UserTenantVo;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@ -329,4 +330,10 @@ public class DisasterInfoController {
Boolean flag=disasterInfoService.updateById(disasterInfo);
return R.data(flag);
}
@ApiOperationSupport(order = 6)
@ApiOperation(value = "提交", notes = "传入Tool")
@PostMapping("/submit")
public R submit(@ApiParam(value = "Tool对象", required = true) @RequestBody DisasterInfo disasterInfo) {
return R.status(disasterInfoService.saveOrUpdate(disasterInfo));
}
}

3
kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java
View File

@ -38,6 +38,9 @@ public class ToolController{
if(!StringUtils.isEmpty(tool.getToolName())){
queryWrapper.like("tool_name", tool.getToolName());
}
if(!StringUtils.isEmpty(tool.getLabel())){
queryWrapper.like("label", tool.getLabel());
}
String checkd = tool.getChecked();
if(checkd != null && checkd.equals("1")){
queryWrapper.isNull("review_time");

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

@ -143,7 +143,10 @@
d.disaster_keyword,
d.upload_time,
d.geometry,
d.respond_status
d.respond_status,
d.chief_id,
d.chief_name
From
guest_manage_disaster_ref ud join
guest_info u on u.id = ud.sponsor_id JOIN
@ -158,6 +161,9 @@
<if test="callForHelpVo.respondStatus == 3 or callForHelpVo.respondStatus == '3'" >
d.respond_status = 2 or d.respond_status = 3
</if>
<if test="callForHelpVo.chiefId != null" >
d.chief_id = #{callForHelpVo.chiefId}
</if>
</where>
order by d.upload_time desc
</select>

2
kn-sys-manager/src/main/java/org/springblade/auth/SystemManagerApplication.java
View File

@ -18,7 +18,7 @@ import org.springframework.context.annotation.ComponentScan;
public class SystemManagerApplication {
public static void main(String[] args) {
BladeApplication.run("glj-"+CommonConstant.KN_SYSTEM_MANAGER_MODULE_NAME, SystemManagerApplication.class, args);
BladeApplication.run("yyhouc-"+CommonConstant.KN_SYSTEM_MANAGER_MODULE_NAME, SystemManagerApplication.class, args);
}
}

1
kn-sys-manager/src/main/java/org/springblade/auth/system/controller/DictBizController.java
View File

@ -57,7 +57,6 @@ public class DictBizController {
DictBiz detail = dictService.getOne(Condition.getQueryWrapper(dict));
return R.data(DictBizWrapper.build().entityVO(detail));
}
/**
* 列表
*/