diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java index ba542460..f5a6f6a4 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java @@ -1,6 +1,7 @@ package com.bonus.sgzb.base.api.domain; import com.bonus.sgzb.common.core.web.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -61,6 +62,11 @@ public class MaType extends BaseEntity { @ApiModelProperty(value = "租赁单价") private String leasePrice; + /** 租赁单价 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "租赁单价") + private Date effTime; + @ApiModelProperty(value = "外部价格") private String rentPrice; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java index 54eeec15..0a0134a8 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java @@ -1,16 +1,12 @@ package com.bonus.sgzb.base.service.impl; -import cn.hutool.http.server.HttpServerRequest; import com.bonus.sgzb.base.domain.RepairApplyRecord; import com.bonus.sgzb.base.domain.RepairPartDetails; import com.bonus.sgzb.base.domain.RepairTask; import com.bonus.sgzb.base.domain.RepairTaskDetails; -import com.bonus.sgzb.base.domain.vo.TreeSelect; import com.bonus.sgzb.base.domain.vo.dictVo; import com.bonus.sgzb.base.mapper.RepairMapper; import com.bonus.sgzb.base.service.RepairService; -import com.bonus.sgzb.common.core.constant.TokenConstants; -import com.bonus.sgzb.common.core.utils.SpringUtils; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.security.service.TokenService; import com.bonus.sgzb.common.security.utils.SecurityUtils; diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml index 00b81d4a..9ef3ee62 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml @@ -86,7 +86,7 @@ LEFT JOIN tm_task_agreement tta ON bai.task_id = tta.task_id LEFT JOIN bm_agreement_info bai2 ON tta.agreement_id = bai2.agreement_id LEFT JOIN bm_unit_info bui ON bai2.unit_id = bui.unit_id - LEFT JOIN bm_project_info bpi ON bai2.project_id = bpi.pro_id + LEFT JOIN bm_project_info bpi ON bai2.project_id = bpi.pro_id and bpi.status = '0' and bpi.del_flag = '0' left join sys_user su on rd.create_by = su.user_id left join sys_dic sd on sd.id = tt.task_status where 1=1 diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/config/ResourcesConfig.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/config/ResourcesConfig.java new file mode 100644 index 00000000..75947bfc --- /dev/null +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/config/ResourcesConfig.java @@ -0,0 +1,51 @@ +package com.bonus.sgzb.system.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +import java.io.File; + +/** + * 通用映射配置 + * + * @author ruoyi + */ +@Configuration +public class ResourcesConfig implements WebMvcConfigurer +{ + /** + * 上传文件存储在本地的根路径 + */ + @Value("${file.path}") + private String localFilePath; + + /** + * 资源映射路径 前缀 + */ + @Value("${file.prefix}") + public String localFilePrefix; + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) + { + /** 本地文件上传路径 */ + registry.addResourceHandler("/**") + .addResourceLocations("file:" + localFilePath + File.separator); + } + + /** + * 开启跨域 + */ + @Override + public void addCorsMappings(CorsRegistry registry) { + // 设置允许跨域的路由 + registry.addMapping( "/**") + // 设置允许跨域请求的域名 + .allowedOrigins("*") + // 设置允许的方法 + .allowedMethods("GET"); + } +} \ No newline at end of file diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java new file mode 100644 index 00000000..be2cee5c --- /dev/null +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SelectController.java @@ -0,0 +1,35 @@ +package com.bonus.sgzb.system.controller; + +import com.bonus.sgzb.common.core.web.domain.AjaxResult; +import com.bonus.sgzb.system.domain.SelectDto; +import com.bonus.sgzb.system.service.SelectService; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * @author 10488 + * 统一下拉选 + */ +@RestController +@RequestMapping("/select/") +public class SelectController { + + @Resource(name = "SelectService") + private SelectService service; + + @ApiOperation(value = "往来单位下拉选") + @PostMapping("getUnitData") + public AjaxResult getUnitData(SelectDto dto) { + return service.getUnitData(dto); + } + + @ApiOperation(value = "工程下拉选") + @PostMapping("getProData") + public AjaxResult getProData(SelectDto dto) { + return service.getProData(dto); + } +} diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SelectDto.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SelectDto.java new file mode 100644 index 00000000..7d400068 --- /dev/null +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SelectDto.java @@ -0,0 +1,13 @@ +package com.bonus.sgzb.system.domain; + +import lombok.Data; + +/** + * @author 10488 + */ +@Data +public class SelectDto { + + /** 参数id*/ + private String id; +} diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SelectVo.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SelectVo.java new file mode 100644 index 00000000..2b0814f2 --- /dev/null +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SelectVo.java @@ -0,0 +1,16 @@ +package com.bonus.sgzb.system.domain; + +import lombok.Data; + +/** + * @author 10488 + */ +@Data +public class SelectVo { + + /** id*/ + private long id; + + /** 名称*/ + private String titleName; +} diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SelectMapper.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SelectMapper.java new file mode 100644 index 00000000..b894e303 --- /dev/null +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SelectMapper.java @@ -0,0 +1,32 @@ +package com.bonus.sgzb.system.mapper; + +import com.bonus.sgzb.system.domain.SelectDto; +import com.bonus.sgzb.system.domain.SelectVo; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * @author 10488 + * 统一下拉选 + */ +@Repository("SelectMapper") +public interface SelectMapper { + /** + * @param dto + * @return List + * @description 往来单位 + * @author cwchen + * @date 2023/12/20 14:23 + */ + List getUnitData(SelectDto dto); + + /** + * @param dto + * @return List + * @description 工程 + * @author cwchen + * @date 2023/12/20 15:05 + */ + List getProData(SelectDto dto); +} diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/SelectService.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/SelectService.java new file mode 100644 index 00000000..8466a82b --- /dev/null +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/SelectService.java @@ -0,0 +1,29 @@ +package com.bonus.sgzb.system.service; + +import com.bonus.sgzb.common.core.web.domain.AjaxResult; +import com.bonus.sgzb.system.domain.SelectDto; + +/** + * @author 10488 + * 统一下拉选 + */ +public interface SelectService { + + /** + * @param dto + * @return AjaxResult + * @description 往来单位 + * @author cwchen + * @date 2023/12/20 14:20 + */ + AjaxResult getUnitData(SelectDto dto); + + /** + * @param dto + * @return AjaxResult + * @description 工程 + * @author cwchen + * @date 2023/12/20 15:04 + */ + AjaxResult getProData(SelectDto dto); +} diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SelectServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SelectServiceImpl.java new file mode 100644 index 00000000..639874e2 --- /dev/null +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SelectServiceImpl.java @@ -0,0 +1,47 @@ +package com.bonus.sgzb.system.service.impl; + +import com.bonus.sgzb.common.core.web.domain.AjaxResult; +import com.bonus.sgzb.system.domain.SelectDto; +import com.bonus.sgzb.system.domain.SelectVo; +import com.bonus.sgzb.system.mapper.SelectMapper; +import com.bonus.sgzb.system.service.SelectService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * @author 10488 + * 统一下拉选 + */ +@Service("SelectService") +@Slf4j +public class SelectServiceImpl implements SelectService { + + @Resource(name = "SelectMapper") + private SelectMapper mapper; + + @Override + public AjaxResult getUnitData(SelectDto dto) { + List list = new ArrayList<>(); + try { + list = mapper.getUnitData(dto); + } catch (Exception e) { + log.error("往来单位-查询失败",e); + } + return AjaxResult.success(list); + } + + @Override + public AjaxResult getProData(SelectDto dto) { + List list = new ArrayList<>(); + try { + list = mapper.getProData(dto); + } catch (Exception e) { + log.error("工程-查询失败",e); + } + return AjaxResult.success(list); + } +} diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml new file mode 100644 index 00000000..499e6738 --- /dev/null +++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml @@ -0,0 +1,44 @@ + + + + + + + + + + \ No newline at end of file