sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xds
姜玉琦 2024-07-08 00:21:30 +08:00
parent 719d5d555b
commit 264b81b661
5 changed files with 126 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/application.yml
View File

@ -24,7 +24,7 @@ spring:
# 国际化资源文件路径
basename: i18n/messages
profiles:
active: druid
active: prod
# 文件上传
servlet:
multipart:

2
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
View File

@ -194,7 +194,7 @@ public class FileUploadUtils
public static final String extractFilename(MultipartFile file)
{
return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
getYzFilename(FilenameUtils.getBaseName(file.getOriginalFilename())), Seq.getId(Seq.uploadSeqType), getExtension(file));
FilenameUtils.getBaseName(getYzFilename(file.getOriginalFilename())), Seq.getId(Seq.uploadSeqType), getExtension(file));
}
/**

111
ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/WxProjectFunVerifyController.java 100644
View File

@ -0,0 +1,111 @@
package com.ruoyi.web.project.controller;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.yanzhu.jh.project.domain.SurProjectFunVerify;
import com.yanzhu.jh.project.service.ISurProjectFunVerifyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @version : V1.0
* @ClassName: WxProjectFunVerifyController
* @Description: 工程功能检验管理
* @Auther: JiangYuQi
* @Date: 2024/07/07 18:03
*/
@RestController
@RequestMapping("/wechat/projectFunVerify")
public class WxProjectFunVerifyController extends BaseController {
@Autowired
private ISurProjectFunVerifyService surProjectFunVerifyService;
/**
* 查询当前用户工程功能检验项目列表
* @param surProjectFunVerify
* @return
*/
@GetMapping("/list")
public TableDataInfo list(SurProjectFunVerify surProjectFunVerify){
if(surProjectFunVerify.getDeptId()==0){
surProjectFunVerify.setDeptId(null);
}
//启用分页
startPage();
List<SurProjectFunVerify> list = surProjectFunVerifyService.selectSurProjectFunVerifyList(surProjectFunVerify);
return getDataTable(list);
}
/**
* 统计工程功能检验
* @param surProjectFunVerify
* @return
*/
@GetMapping("/findGroupCountByApprove")
public AjaxResult findGroupCountByApprove(SurProjectFunVerify surProjectFunVerify){
if(surProjectFunVerify.getDeptId()==0){
surProjectFunVerify.setDeptId(null);
}
return success(surProjectFunVerifyService.findGroupCountByApprove(surProjectFunVerify));
}
/**
* 查询工程功能检验详情
* @param id
* @return
*/
@GetMapping("/info/{id}")
public AjaxResult info(@PathVariable("id") Long id){
return success(surProjectFunVerifyService.selectSurProjectFunVerifyById(id));
}
/**
* 新增工程功能检验
* @param surProjectFunVerify
* @return
*/
@PostMapping("/add")
@Log(title = "工程功能检验", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody SurProjectFunVerify surProjectFunVerify){
return success(surProjectFunVerifyService.insertSurProjectFunVerify(surProjectFunVerify));
}
/**
* 修改工程功能检验
* @param surProjectFunVerify
* @return
*/
@PostMapping("/edit")
@Log(title = "工程功能检验", businessType = BusinessType.UPDATE)
public AjaxResult edit(@RequestBody SurProjectFunVerify surProjectFunVerify){
return success(surProjectFunVerifyService.updateSurProjectFunVerify(surProjectFunVerify));
}
/**
* 修改工程功能检验
* @param surProjectFunVerify
* @return
*/
@PostMapping("/editNoLog")
@Log(title = "工程功能检验", businessType = BusinessType.UPDATE)
public AjaxResult editNoLog(@RequestBody SurProjectFunVerify surProjectFunVerify){
return success(surProjectFunVerifyService.updateSurProjectFunVerifyNoLog(surProjectFunVerify));
}
/**
* 删除工程功能检验
*/
@Log(title = "工程功能检验", businessType = BusinessType.DELETE)
@GetMapping("/remove/{id}")
public AjaxResult remove(@PathVariable("id") Long id)
{
return toAjax(surProjectFunVerifyService.deleteSurProjectFunVerifyById(id));
}
}

10
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectFunVerify.java
View File

@ -38,6 +38,8 @@ public class SurProjectFunVerify extends BaseEntity
@Excel(name = "检验类型")
private String checkType;
private String checkTypeName;
/** 检验报告 */
@Excel(name = "检验报告")
private String mainImage;
@ -243,6 +245,14 @@ public class SurProjectFunVerify extends BaseEntity
this.approveStatus = approveStatus;
}
public String getCheckTypeName() {
return checkTypeName;
}
public void setCheckTypeName(String checkTypeName) {
this.checkTypeName = checkTypeName;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

4
yanzhu-jh/src/main/resources/mapper/project/SurProjectFunVerifyMapper.xml
View File

@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="projectId" column="project_id" />
<result property="deptId" column="dept_id" />
<result property="checkType" column="check_type" />
<result property="checkTypeName" column="check_type_name" />
<result property="mainImage" column="main_image" />
<result property="imageUrls" column="image_urls" />
<result property="checkName" column="check_name" />
@ -32,9 +33,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectSurProjectFunVerifyVo">
select spfv.id, spfv.project_id, spfv.dept_id, spfv.check_type, spfv.main_image, spfv.image_urls, spfv.check_name, spfv.check_result, spfv.intro, spfv.quality_user, spfv.quality_user_name, spfv.supervise_user, spfv.supervise_user_name, spfv.check_date, spfv.check_files, spfv.is_del, spfv.create_by, spfv.create_time, spfv.update_by, spfv.update_time, spfv.remark, spfv.approve_status, sp.projectName, sd.dept_name from sur_project_fun_verify spfv
select spfv.id, spfv.project_id, spfv.dept_id, spfv.check_type, sdd.dict_label as check_type_name,spfv.main_image, spfv.image_urls, spfv.check_name, spfv.check_result, spfv.intro, spfv.quality_user, spfv.quality_user_name, spfv.supervise_user, spfv.supervise_user_name, spfv.check_date, spfv.check_files, spfv.is_del, spfv.create_by, spfv.create_time, spfv.update_by, spfv.update_time, spfv.remark, spfv.approve_status, sp.projectName, sd.dept_name from sur_project_fun_verify spfv
left join sur_project sp on spfv.project_id = sp.id
left join sys_dept sd on sd.dept_id = spfv.dept_id
left join sys_dict_data sdd on sdd.dict_value = spfv.check_type and sdd.dict_type='project_fun_verify_type'
</sql>
<select id="selectSurProjectFunVerifyList" parameterType="SurProjectFunVerify" resultMap="SurProjectFunVerifyResult">