From 8c91afa9c1bbe5fae9d88cfd1e7243c376af69fe Mon Sep 17 00:00:00 2001 From: “djh” <“3298565835@qq.com”> Date: 星期一, 21 七月 2025 09:19:29 +0800 Subject: [PATCH] 修改 --- multi-system/src/main/java/com/gkhy/exam/system/domain/SupplierSureCertifity.java | 67 ++++ multi-system/src/main/java/com/gkhy/exam/system/service/SupplierSureQualityService.java | 11 multi-system/src/main/resources/mapper/system/ExStudentMapper.xml | 2 multi-system/src/main/resources/mapper/system/CatalogueMapper.xml | 9 multi-system/src/main/java/com/gkhy/exam/system/service/impl/ExStudentServiceImpl.java | 24 multi-system/src/main/java/com/gkhy/exam/system/domain/Catalogue.java | 4 multi-system/src/main/resources/mapper/system/SupplierSureCertifityMapper.xml | 21 + multi-system/src/main/java/com/gkhy/exam/system/mapper/SupplierSurePerformanceMapper.java | 11 multi-system/src/main/java/com/gkhy/exam/system/domain/SupplierSurePerformance.java | 119 +++++++ multi-system/src/main/java/com/gkhy/exam/system/service/impl/SupplierSurePerformanceServiceImpl.java | 45 ++ multi-system/src/main/java/com/gkhy/exam/system/service/impl/SupplierSureQualityServiceImpl.java | 27 + multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/InternalAuditController.java | 51 --- multi-system/src/main/java/com/gkhy/exam/system/domain/SupplierSureQuality.java | 98 ++++++ multi-system/src/main/java/com/gkhy/exam/system/service/SupplierSurePerformanceService.java | 11 multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditPersonServiceImpl.java | 6 multi-system/src/main/java/com/gkhy/exam/system/service/impl/SupplierSureCertifityServiceImpl.java | 49 +++ multi-system/src/main/java/com/gkhy/exam/system/domain/SupplierSure.java | 22 multi-system/src/main/java/com/gkhy/exam/system/service/SupplierSureCertifityService.java | 15 multi-system/src/main/resources/mapper/system/SupplierSureMapper.xml | 7 multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/SupplierSureController.java | 182 +++++++++++ multi-system/src/main/java/com/gkhy/exam/system/service/impl/SupplierSureServiceImpl.java | 9 multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysUserServiceImpl.java | 15 multi-system/src/main/java/com/gkhy/exam/system/domain/vo/CatalogueVo.java | 1 multi-system/src/main/resources/mapper/system/InternalAuditPersonMapper.xml | 2 multi-system/src/main/resources/mapper/system/SupplierSureQualityMapper.xml | 41 ++ multi-system/src/main/resources/mapper/system/SupplierSurePerformanceMapper.xml | 48 +++ multi-system/src/main/java/com/gkhy/exam/system/mapper/SupplierSureQualityMapper.java | 13 multi-system/src/main/java/com/gkhy/exam/system/mapper/SupplierSureCertifityMapper.java | 12 28 files changed, 837 insertions(+), 85 deletions(-) diff --git a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/InternalAuditController.java b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/InternalAuditController.java index 6fe61d8..e23faaa 100644 --- a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/InternalAuditController.java +++ b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/InternalAuditController.java @@ -24,8 +24,7 @@ @Autowired private InternalAuditCarryService carryService; - @Autowired - private SupplierSureService sureService; + @Autowired private CustomerService customerService; @@ -232,54 +231,6 @@ } - /** - * 合格供应商列表 - * @param sure - * @return - */ - @ApiOperation(value = "合格供应商列表(分页)") - @ApiImplicitParams({ - @ApiImplicitParam(paramType = "query", name = "pageNum", dataType = "int", required = false, value = "当前页,默认1"), - @ApiImplicitParam(paramType = "query", name = "pageSize", dataType = "int", required = false, value = "每页数目,默认10"), - }) - @GetMapping("/supplier/list") - public CommonResult listSupplier(SupplierSure sure){ - return CommonResult.success(sureService.selectSupplierList(sure)); - } - - - /** - * 合格供应商新增 - * @param sure - * @return - */ - @ApiOperation(value = "合格供应商新增") - @PostMapping("/supplier/insert") - public CommonResult insertSupplier(@RequestBody SupplierSure sure){ - return sureService.insertSupplier(sure); - } - - /** - * 合格供应商修改 - * @param sure - * @return - */ - @ApiOperation(value = "合格供应商修改") - @PostMapping("/supplier/update") - public CommonResult updateSupplier(@RequestBody SupplierSure sure){ - return sureService.updateSupplier(sure); - } - - /** - * 合格供应商删除 - * @param supplierId - * @return - */ - @ApiOperation(value = "合格供应商删除") - @GetMapping("/supplier/deleted") - public CommonResult deletedSupplier(@RequestParam("supplierId") Integer supplierId){ - return sureService.deletedSupplier(supplierId); - } /** diff --git a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/SupplierSureController.java b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/SupplierSureController.java new file mode 100644 index 0000000..04a3053 --- /dev/null +++ b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/SupplierSureController.java @@ -0,0 +1,182 @@ +package com.gkhy.exam.admin.controller.web; + +import com.gkhy.exam.common.api.CommonResult; +import com.gkhy.exam.system.domain.SupplierSure; +import com.gkhy.exam.system.domain.SupplierSureCertifity; +import com.gkhy.exam.system.domain.SupplierSurePerformance; +import com.gkhy.exam.system.domain.SupplierSureQuality; +import com.gkhy.exam.system.service.SupplierSureCertifityService; +import com.gkhy.exam.system.service.SupplierSurePerformanceService; +import com.gkhy.exam.system.service.SupplierSureQualityService; +import com.gkhy.exam.system.service.SupplierSureService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@Api(tags = "供应商管理") +@RestController +@RequestMapping("/supplier") +public class SupplierSureController { + + @Autowired + private SupplierSureService sureService; + + @Autowired + private SupplierSureCertifityService certifityService; + + @Autowired + private SupplierSureQualityService qualityService; + + @Autowired + private SupplierSurePerformanceService performanceService; + + + /** + * 合格供应商列表 + * @param sure + * @return + */ + @ApiOperation(value = "合格供应商列表(分页)") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "query", name = "pageNum", dataType = "int", required = false, value = "当前页,默认1"), + @ApiImplicitParam(paramType = "query", name = "pageSize", dataType = "int", required = false, value = "每页数目,默认10"), + }) + @GetMapping("/list") + public CommonResult listSupplier(SupplierSure sure){ + return CommonResult.success(sureService.selectSupplierList(sure)); + } + + + /** + * 合格供应商新增 + * @param sure + * @return + */ + @ApiOperation(value = "合格供应商新增") + @PostMapping("/insert") + public CommonResult insertSupplier(@RequestBody SupplierSure sure){ + return sureService.insertSupplier(sure); + } + + /** + * 合格供应商修改 + * @param sure + * @return + */ + @ApiOperation(value = "合格供应商修改") + @PostMapping("/update") + public CommonResult updateSupplier(@RequestBody SupplierSure sure){ + return sureService.updateSupplier(sure); + } + + /** + * 合格供应商删除 + * @param supplierId + * @return + */ + @ApiOperation(value = "合格供应商删除") + @GetMapping("/deleted") + public CommonResult deletedSupplier(@RequestParam("supplierId") Integer supplierId){ + return sureService.deletedSupplier(supplierId); + } + + + /** + * 合格供应商证书列表 + * @param certifity + * @return + */ + @ApiOperation(value = "合格供应商证书列表") + @GetMapping("/certifity/list") + public CommonResult listCertifity(SupplierSureCertifity certifity){ + return certifityService.selectCertifityList(certifity); + } + + + /** + * 合格供应商证书新增 + * @param certifity + * @return + */ + @ApiOperation(value = "合格供应商证书新增") + @PostMapping("/certifity/insert") + public CommonResult insertCertifity(@RequestBody SupplierSureCertifity certifity){ + return certifityService.insertCertifity(certifity); + } + + /** + * 合格供应商证书修改 + * @param certifity + * @return + */ + @ApiOperation(value = "合格供应商证书修改") + @PostMapping("/certifity/update") + public CommonResult updateCertifity(@RequestBody SupplierSureCertifity certifity){ + return certifityService.updateCertifity(certifity); + } + + /** + * 合格供应商证书删除 + * @param certifityId + * @return + */ + @ApiOperation(value = "合格供应商证书删除") + @GetMapping("/certifity/deleted") + public CommonResult deletedCertifity(@RequestParam("certifityId") Integer certifityId){ + return certifityService.deletedCertifity(certifityId); + } + + + /** + * 合格供应商业绩评定列表 + * @param supplierSureId + * @return + */ + @ApiOperation(value = "合格供应商业绩评定数据") + @GetMapping("/performance/list") + public CommonResult listPerformance(@RequestParam("supplierSureId") Integer supplierSureId){ + return performanceService.selectPerformanceList(supplierSureId); + } + + + + /** + * 合格供应商业绩评定修改 + * @param performance + * @return + */ + @ApiOperation(value = "合格供应商业绩评定修改") + @PostMapping("/performance/update") + public CommonResult updatePerformance(@RequestBody SupplierSurePerformance performance){ + return performanceService.updatePerformance(performance); + } + + + /** + * 合格供应商质量保证列表 + * @param supplierSureId + * @return + */ + @ApiOperation(value = "合格供应商质量保证数据") + @GetMapping("/quality/list") + public CommonResult listQuality(@RequestParam("supplierSureId") Integer supplierSureId){ + return qualityService.selectQualityList(supplierSureId); + } + + + + /** + * 合格供应商质量保证修改 + * @param quality + * @return + */ + @ApiOperation(value = "合格供应商质量保证修改") + @PostMapping("/quality/update") + public CommonResult updateQuality(@RequestBody SupplierSureQuality quality){ + return qualityService.updateQuality(quality); + } + +} diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/Catalogue.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/Catalogue.java index e7986d0..c87bf16 100644 --- a/multi-system/src/main/java/com/gkhy/exam/system/domain/Catalogue.java +++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/Catalogue.java @@ -42,6 +42,10 @@ @TableField(value = "type") private Integer type; + @ApiModelProperty("排序字段") + @TableField(value = "sort") + private Integer sort; + @TableField(value = "del_flag") private Integer delFlag; diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/SupplierSure.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/SupplierSure.java index 1bdfebe..c18ea27 100644 --- a/multi-system/src/main/java/com/gkhy/exam/system/domain/SupplierSure.java +++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/SupplierSure.java @@ -29,8 +29,12 @@ private String supplierName; @ApiModelProperty(value = "供应商类型") - @TableField("supplier_type") - private String supplierType; + @TableField("supplier_addr") + private String supplierAddr; + + @ApiModelProperty(value = "主营产品") + @TableField("merito") + private String merito; @ApiModelProperty(value = "联系人") @TableField("user") @@ -40,17 +44,9 @@ @TableField("phone") private String phone; - @ApiModelProperty(value = "邮箱") - @TableField("emil") - private String emil; - - @ApiModelProperty(value = "主营产品") - @TableField("merito") - private String merito; - - @ApiModelProperty(value = "服务内容") - @TableField("content") - private String content; + @ApiModelProperty(value = "备注") + @TableField("remark") + private String remark; @TableField("del_flag") private Integer delFlag; diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/SupplierSureCertifity.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/SupplierSureCertifity.java new file mode 100644 index 0000000..eb15ae8 --- /dev/null +++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/SupplierSureCertifity.java @@ -0,0 +1,67 @@ +package com.gkhy.exam.system.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("supplier_sure_certifity") +@ApiModel(value = "SupplierSureCertifity对象", description = "合格供应商证书") +public class SupplierSureCertifity implements Serializable { + + @ApiModelProperty("主键") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "供应商id",required = true) + @TableField("supplier_sure_id") + private Integer supplierSureId; + + @ApiModelProperty(value = "证书名称") + @TableField("certifity_name") + private String certifityName; + + @ApiModelProperty(value = "证书路径") + @TableField("file_path") + private String filePath; + + @TableField("del_flag") + private Integer delFlag; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +} diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/SupplierSurePerformance.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/SupplierSurePerformance.java new file mode 100644 index 0000000..a21faa9 --- /dev/null +++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/SupplierSurePerformance.java @@ -0,0 +1,119 @@ +package com.gkhy.exam.system.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +@Data +@TableName("supplier_sure_performance") +@ApiModel(value = "SupplierSurePerformance对象", description = "合格供应商业绩评定表") +public class SupplierSurePerformance implements Serializable { + + @ApiModelProperty("主键") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "供应商id",required = true) + @TableField("supplier_sure_id") + private Integer supplierSureId; + + @ApiModelProperty(value = "供方名称") + @TableField("name") + private String name; + + @ApiModelProperty(value = "供方地址") + @TableField("address") + private String address; + + @ApiModelProperty(value = "联系人") + @TableField("people") + private String people; + + @ApiModelProperty(value = "联系人电话") + @TableField("phone") + private String phone; + + @ApiModelProperty(value = "邮编") + @TableField("emil") + private String emil; + + @ApiModelProperty(value = "供应产品") + @TableField("product") + private String product; + + @ApiModelProperty(value = "产品类别") + @TableField("type") + private String type; + + @ApiModelProperty(value = "评审依据") + @TableField("gist") + private String gist; + + @ApiModelProperty(value = "验证方式 1现场验证 2入库验证 3供方货源验证") + @TableField("verify") + private Integer verify; + + @ApiModelProperty(value = "产品质量") + @TableField("p1") + private Integer p1; + + @ApiModelProperty(value = "交货期") + @TableField("p2") + private Integer p2; + + @ApiModelProperty(value = "履约能力") + @TableField("p3") + private Integer p3; + + @ApiModelProperty(value = "价格") + @TableField("p4") + private Integer p4; + + @ApiModelProperty(value = "售后服务") + @TableField("p5") + private Integer p5; + + @ApiModelProperty(value = "资质") + @TableField("p6") + private Integer p6; + + @ApiModelProperty(value = "评审意见 1保留 2暂停,整改后在评价 3剔除") + @TableField("opinion") + private Integer opinion; + + @ApiModelProperty(value = "评审人员签字") + @TableField("review_users") + private String reviewUsers; + + @TableField(exist = false) + private String reviewNames; + + @ApiModelProperty(value = "评审日期") + @TableField("review_time") + private LocalDateTime reviewTime; + + @ApiModelProperty(value = "审批意见") + @TableField("review_mess") + private String reviewMess; + + @ApiModelProperty(value = "审批人id") + @TableField("check_id") + private Integer checkId; + + @TableField(exist = false) + private String checkName; + + @ApiModelProperty(value = "审批日期") + @TableField("check_time") + private LocalDateTime checkTime; + + + +} diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/SupplierSureQuality.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/SupplierSureQuality.java new file mode 100644 index 0000000..035d866 --- /dev/null +++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/SupplierSureQuality.java @@ -0,0 +1,98 @@ +package com.gkhy.exam.system.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +@Data +@TableName("supplier_sure_quality") +@ApiModel(value = "SupplierSureQuality对象", description = "合格供应商质量保证") +public class SupplierSureQuality implements Serializable { + + @ApiModelProperty("主键") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "供应商id",required = true) + @TableField("supplier_sure_id") + private Integer supplierSureId; + + @ApiModelProperty(value = "供方名称") + @TableField("name") + private String name; + + @ApiModelProperty(value = "供方地址") + @TableField("address") + private String address; + + @ApiModelProperty(value = "负责人") + @TableField("person") + private String person; + + @ApiModelProperty(value = "邮编") + @TableField("emil") + private String emil; + + @ApiModelProperty(value = "联系电话") + @TableField("phone") + private String phone; + + @ApiModelProperty(value = "生产特点 1成批成产 2流水线生产 3单台生产 4其他") + @TableField("trait") + private String trait; + + @ApiModelProperty(value = "生产设备 1齐全、良好 2基本齐全、尚可 3不全 4代理商") + @TableField("facility") + private String facility; + + @ApiModelProperty(value = "工艺文件 1齐备 2有一部分 3没有 4代理商") + @TableField("craft") + private String craft; + + @ApiModelProperty(value = "新品开发能力 1能自行设计开发新品 2只能开发简单产品 3没有自行开发能力,代理商") + @TableField("develop") + private String develop; + + @ApiModelProperty(value = "国际合作经验 1是外资企业 2是合资企业 3给外企提供产品 4无对外合作经验 5有对外合作经验,但不经常发生") + @TableField("team_work") + private String teamWork; + + @ApiModelProperty(value = "公司资质情况 1营业执照 2营业执照有效期内 3营业执照有效期外 4高新技术企业 5高新技术企业有效期内 6高新技术企业有效期外 7资质代理商 8其他资质情况") + @TableField("qualification") + private String qualification; + + @ApiModelProperty(value = "其他资质情况详情") + @TableField("other_qualifi") + private String otherQualifi; + + @ApiModelProperty(value = "1通过产品认证 2没有产品认证 3通过质量体系认证 4没有体系认证 5其他认证 6具体内容") + @TableField("product") + private String product; + + @ApiModelProperty(value = "其他认证具体内容") + @TableField("other_product") + private String otherProduct; + + @ApiModelProperty(value = "供方企业确认") + @TableField("company_mess") + private String companyMess; + + @ApiModelProperty(value = "负责人") + @TableField("charge_name") + private String chargeName; + + @ApiModelProperty(value = "日期") + @TableField("charge_time") + private LocalDateTime chargeTime; + + + + +} diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/vo/CatalogueVo.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/vo/CatalogueVo.java index 44d6f8e..8a39063 100644 --- a/multi-system/src/main/java/com/gkhy/exam/system/domain/vo/CatalogueVo.java +++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/vo/CatalogueVo.java @@ -16,6 +16,7 @@ private String mess; private Integer type; + private Integer sort; private Integer delFlag; diff --git a/multi-system/src/main/java/com/gkhy/exam/system/mapper/SupplierSureCertifityMapper.java b/multi-system/src/main/java/com/gkhy/exam/system/mapper/SupplierSureCertifityMapper.java new file mode 100644 index 0000000..d9b51bf --- /dev/null +++ b/multi-system/src/main/java/com/gkhy/exam/system/mapper/SupplierSureCertifityMapper.java @@ -0,0 +1,12 @@ +package com.gkhy.exam.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.gkhy.exam.system.domain.SupplierSureCertifity; +import org.mapstruct.Mapper; + +import java.util.List; + +@Mapper +public interface SupplierSureCertifityMapper extends BaseMapper<SupplierSureCertifity> { + List<SupplierSureCertifity> selectCertifityList(SupplierSureCertifity certifity); +} diff --git a/multi-system/src/main/java/com/gkhy/exam/system/mapper/SupplierSurePerformanceMapper.java b/multi-system/src/main/java/com/gkhy/exam/system/mapper/SupplierSurePerformanceMapper.java new file mode 100644 index 0000000..e734b8c --- /dev/null +++ b/multi-system/src/main/java/com/gkhy/exam/system/mapper/SupplierSurePerformanceMapper.java @@ -0,0 +1,11 @@ +package com.gkhy.exam.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.gkhy.exam.system.domain.SupplierSurePerformance; +import org.apache.ibatis.annotations.Param; + +public interface SupplierSurePerformanceMapper extends BaseMapper<SupplierSurePerformance> { + SupplierSurePerformance selectPerformanceList(@Param("supplierSureId") Integer supplierSureId); + + void savePerformance(@Param("id") Integer id); +} diff --git a/multi-system/src/main/java/com/gkhy/exam/system/mapper/SupplierSureQualityMapper.java b/multi-system/src/main/java/com/gkhy/exam/system/mapper/SupplierSureQualityMapper.java new file mode 100644 index 0000000..40fd9c3 --- /dev/null +++ b/multi-system/src/main/java/com/gkhy/exam/system/mapper/SupplierSureQualityMapper.java @@ -0,0 +1,13 @@ +package com.gkhy.exam.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.gkhy.exam.system.domain.SupplierSureQuality; +import org.apache.ibatis.annotations.Param; +import org.mapstruct.Mapper; + +@Mapper +public interface SupplierSureQualityMapper extends BaseMapper<SupplierSureQuality> { + SupplierSureQuality selectQualityList(@Param("supplierSureId") Integer supplierSureId); + + void saveQuality(Integer id); +} diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/SupplierSureCertifityService.java b/multi-system/src/main/java/com/gkhy/exam/system/service/SupplierSureCertifityService.java new file mode 100644 index 0000000..53b88f9 --- /dev/null +++ b/multi-system/src/main/java/com/gkhy/exam/system/service/SupplierSureCertifityService.java @@ -0,0 +1,15 @@ +package com.gkhy.exam.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gkhy.exam.common.api.CommonResult; +import com.gkhy.exam.system.domain.SupplierSureCertifity; + +public interface SupplierSureCertifityService extends IService<SupplierSureCertifity> { + CommonResult selectCertifityList(SupplierSureCertifity certifity); + + CommonResult insertCertifity(SupplierSureCertifity certifity); + + CommonResult updateCertifity(SupplierSureCertifity certifity); + + CommonResult deletedCertifity(Integer certifityId); +} diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/SupplierSurePerformanceService.java b/multi-system/src/main/java/com/gkhy/exam/system/service/SupplierSurePerformanceService.java new file mode 100644 index 0000000..f370e06 --- /dev/null +++ b/multi-system/src/main/java/com/gkhy/exam/system/service/SupplierSurePerformanceService.java @@ -0,0 +1,11 @@ +package com.gkhy.exam.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gkhy.exam.common.api.CommonResult; +import com.gkhy.exam.system.domain.SupplierSurePerformance; + +public interface SupplierSurePerformanceService extends IService<SupplierSurePerformance> { + CommonResult selectPerformanceList(Integer supplierSureId); + + CommonResult updatePerformance(SupplierSurePerformance performance); +} diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/SupplierSureQualityService.java b/multi-system/src/main/java/com/gkhy/exam/system/service/SupplierSureQualityService.java new file mode 100644 index 0000000..6fb01aa --- /dev/null +++ b/multi-system/src/main/java/com/gkhy/exam/system/service/SupplierSureQualityService.java @@ -0,0 +1,11 @@ +package com.gkhy.exam.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gkhy.exam.common.api.CommonResult; +import com.gkhy.exam.system.domain.SupplierSureQuality; + +public interface SupplierSureQualityService extends IService<SupplierSureQuality> { + CommonResult selectQualityList(Integer supplierSureId); + + CommonResult updateQuality(SupplierSureQuality quality); +} diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ExStudentServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ExStudentServiceImpl.java index 14bd781..04cace5 100644 --- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ExStudentServiceImpl.java +++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ExStudentServiceImpl.java @@ -126,18 +126,18 @@ if(!checkIdNoUnique(student)){ throw new ApiException("身份证号已存在"); } - if(currentUser.getUserType().equals(UserTypeEnum.COMPANY_USER.getCode())){ - if(student.getCreateId()==null){ - throw new ApiException("部门id为空"); - } - }else if(currentUser.getUserType().equals(UserTypeEnum.DEPART_USER.getCode())){ - student.setCreateId(currentUser.getId()); - }else{//当前用户为车间级用户 - if(currentUser.getParentId()==null){ - throw new ApiException("当前用户部门id为空"); - } - student.setCreateId(currentUser.getParentId()); - } +// if(currentUser.getUserType().equals(UserTypeEnum.COMPANY_USER.getCode())){ +//// if(student.getCreateId()==null){ +//// throw new ApiException("部门id为空"); +//// } +// }else if(currentUser.getUserType().equals(UserTypeEnum.DEPART_USER.getCode())){ +// student.setCreateId(currentUser.getId()); +// }else{//当前用户为车间级用户 +// if(currentUser.getParentId()==null){ +// throw new ApiException("当前用户部门id为空"); +// } +// student.setCreateId(currentUser.getParentId()); +// } student.setPassword(SecurityUtils.encryptPassword(Base64.decodeStr(student.getPassword()))); int row=baseMapper.insert(student); if(row<0){ diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditPersonServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditPersonServiceImpl.java index ada0c82..6196f34 100644 --- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditPersonServiceImpl.java +++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditPersonServiceImpl.java @@ -46,8 +46,10 @@ public CommonResult insertPerson(InternalAuditPerson person) { SysUser user = SecurityUtils.getLoginUser().getUser(); ExStudent exStudent = exStudentMapper.selectStudentById(Long.valueOf(person.getPersonId())); - if (user.getDeptId().equals(exStudent.getDeptId())){ - throw new ApiException("请勿选择本部门成员"); + if (user.getDeptId()!=null){ + if (user.getDeptId().equals(exStudent.getDeptId())){ + throw new ApiException("请勿选择本部门成员"); + } } person.setCreateBy(SecurityUtils.getUsername()); person.setCreateTime(LocalDateTime.now()); diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SupplierSureCertifityServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SupplierSureCertifityServiceImpl.java new file mode 100644 index 0000000..d906243 --- /dev/null +++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SupplierSureCertifityServiceImpl.java @@ -0,0 +1,49 @@ +package com.gkhy.exam.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gkhy.exam.common.api.CommonResult; +import com.gkhy.exam.common.exception.ApiException; +import com.gkhy.exam.system.domain.SupplierSureCertifity; +import com.gkhy.exam.system.mapper.SupplierSureCertifityMapper; +import com.gkhy.exam.system.service.SupplierSureCertifityService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class SupplierSureCertifityServiceImpl extends ServiceImpl<SupplierSureCertifityMapper, SupplierSureCertifity> implements SupplierSureCertifityService { + + @Autowired + private SupplierSureCertifityMapper supplierSureCertifityMapper; + + @Override + public CommonResult selectCertifityList(SupplierSureCertifity certifity) { + if (certifity.getSupplierSureId()==null){ + throw new ApiException("供应商id不可为空"); + } + List<SupplierSureCertifity> supplierSureCertifities = supplierSureCertifityMapper.selectCertifityList(certifity); + return CommonResult.success(supplierSureCertifities); + } + + @Override + public CommonResult insertCertifity(SupplierSureCertifity certifity) { + supplierSureCertifityMapper.insert(certifity); + return CommonResult.success(); + } + + @Override + public CommonResult updateCertifity(SupplierSureCertifity certifity) { + supplierSureCertifityMapper.updateById(certifity); + return CommonResult.success(); + } + + @Override + public CommonResult deletedCertifity(Integer certifityId) { + SupplierSureCertifity supplierSureCertifity = new SupplierSureCertifity(); + supplierSureCertifity.setId(certifityId); + supplierSureCertifity.setDelFlag(2); + supplierSureCertifityMapper.updateById(supplierSureCertifity); + return CommonResult.success(); + } +} diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SupplierSurePerformanceServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SupplierSurePerformanceServiceImpl.java new file mode 100644 index 0000000..8716c71 --- /dev/null +++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SupplierSurePerformanceServiceImpl.java @@ -0,0 +1,45 @@ +package com.gkhy.exam.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gkhy.exam.common.api.CommonResult; +import com.gkhy.exam.common.domain.entity.SysUser; +import com.gkhy.exam.system.domain.SupplierSurePerformance; +import com.gkhy.exam.system.mapper.SupplierSurePerformanceMapper; +import com.gkhy.exam.system.mapper.SysUserMapper; +import com.gkhy.exam.system.service.SupplierSurePerformanceService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class SupplierSurePerformanceServiceImpl extends ServiceImpl<SupplierSurePerformanceMapper, SupplierSurePerformance> implements SupplierSurePerformanceService { + @Autowired + private SupplierSurePerformanceMapper supplierSurePerformanceMapper; + @Autowired + private SysUserMapper sysUserMapper; + + + @Override + public CommonResult selectPerformanceList(Integer supplierSureId) { + SupplierSurePerformance supplierSurePerformance = supplierSurePerformanceMapper.selectPerformanceList(supplierSureId); + String reviewUsers = supplierSurePerformance.getReviewUsers(); + if (reviewUsers!=null){ + String[] split = reviewUsers.split(","); + StringBuffer stringBuffer = new StringBuffer(); + for (String fileData : split) { + SysUser sysUser = sysUserMapper.selectById(fileData); + stringBuffer.append(sysUser.getName()).append(","); + } + if (stringBuffer.length()>0){ + String string = stringBuffer.substring(0, stringBuffer.length() - 1).toString(); + supplierSurePerformance.setReviewNames(string); + } + } + return CommonResult.success(supplierSurePerformance); + } + + @Override + public CommonResult updatePerformance(SupplierSurePerformance performance) { + supplierSurePerformanceMapper.updateById(performance); + return CommonResult.success(); + } +} diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SupplierSureQualityServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SupplierSureQualityServiceImpl.java new file mode 100644 index 0000000..981b3cc --- /dev/null +++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SupplierSureQualityServiceImpl.java @@ -0,0 +1,27 @@ +package com.gkhy.exam.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gkhy.exam.common.api.CommonResult; +import com.gkhy.exam.system.domain.SupplierSureQuality; +import com.gkhy.exam.system.mapper.SupplierSureQualityMapper; +import com.gkhy.exam.system.service.SupplierSureQualityService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class SupplierSureQualityServiceImpl extends ServiceImpl<SupplierSureQualityMapper, SupplierSureQuality> implements SupplierSureQualityService { + + @Autowired + private SupplierSureQualityMapper supplierSureQualityMapper; + + @Override + public CommonResult selectQualityList(Integer supplierSureId) { + return CommonResult.success(supplierSureQualityMapper.selectQualityList(supplierSureId)); + } + + @Override + public CommonResult updateQuality(SupplierSureQuality quality) { + supplierSureQualityMapper.updateById(quality); + return CommonResult.success(); + } +} diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SupplierSureServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SupplierSureServiceImpl.java index 597a75a..5b193d6 100644 --- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SupplierSureServiceImpl.java +++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SupplierSureServiceImpl.java @@ -7,7 +7,10 @@ import com.gkhy.exam.common.utils.PageUtils; import com.gkhy.exam.common.utils.SecurityUtils; import com.gkhy.exam.system.domain.SupplierSure; +import com.gkhy.exam.system.domain.SupplierSurePerformance; import com.gkhy.exam.system.mapper.SupplierSureMapper; +import com.gkhy.exam.system.mapper.SupplierSurePerformanceMapper; +import com.gkhy.exam.system.mapper.SupplierSureQualityMapper; import com.gkhy.exam.system.service.SupplierSureService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -20,6 +23,10 @@ @Autowired private SupplierSureMapper supplierSureMapper; + @Autowired + private SupplierSurePerformanceMapper performanceMapper; + @Autowired + private SupplierSureQualityMapper qualityMapper; @Override public CommonPage selectSupplierList(SupplierSure sure) { @@ -38,6 +45,8 @@ sure.setCreateTime(LocalDateTime.now()); sure.setCreateBy(SecurityUtils.getUsername()); supplierSureMapper.insert(sure); + performanceMapper.savePerformance(sure.getId()); + qualityMapper.saveQuality(sure.getId()); return CommonResult.success(); } diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysUserServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysUserServiceImpl.java index 038f668..4d1859f 100644 --- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysUserServiceImpl.java +++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysUserServiceImpl.java @@ -14,9 +14,11 @@ import com.gkhy.exam.common.utils.RedisUtils; import com.gkhy.exam.common.utils.SecurityUtils; import com.gkhy.exam.common.utils.StringUtils; +import com.gkhy.exam.system.domain.ExStudent; import com.gkhy.exam.system.domain.SysUserRole; import com.gkhy.exam.system.mapper.SysUserMapper; import com.gkhy.exam.system.mapper.SysUserRoleMapper; +import com.gkhy.exam.system.service.ExStudentService; import com.gkhy.exam.system.service.SysConfigService; import com.gkhy.exam.system.service.SysUserService; import org.springframework.beans.factory.annotation.Autowired; @@ -49,6 +51,9 @@ private Validator validator; @Autowired private SysUserRoleMapper userRoleMapper; + + @Autowired + private ExStudentService exStudentService; @Override public CommonPage<SysUser> selectUserList(SysUser user) { @@ -133,6 +138,14 @@ @Override public int addUser(SysUser user) { + ExStudent exStudent = new ExStudent(); + exStudent.setCompanyId(user.getCompanyId()); + exStudent.setName(user.getName()); + exStudent.setPassword(user.getPassword()); + exStudent.setDeptId(user.getDeptId()); + exStudent.setDuty(user.getDuty()); + exStudent.setSex(user.getSex()); + exStudent.setPhone(user.getPhone()); checkRequestData(user); checkUserAllowed(user); user.setCreateBy(SecurityUtils.getUsername()); @@ -145,6 +158,8 @@ userRoleList.add(sysUserRole); userRoleMapper.batchUserRole(userRoleList); + exStudentService.insertStudent(exStudent); + if(row<1){ throw new ApiException("新增用户失败"); } diff --git a/multi-system/src/main/resources/mapper/system/CatalogueMapper.xml b/multi-system/src/main/resources/mapper/system/CatalogueMapper.xml index d141aad..ea745dc 100644 --- a/multi-system/src/main/resources/mapper/system/CatalogueMapper.xml +++ b/multi-system/src/main/resources/mapper/system/CatalogueMapper.xml @@ -103,6 +103,7 @@ `mess`, `type`, `del_flag`, + `sort`, `create_by`, `create_time`, `update_by`, @@ -125,8 +126,12 @@ THEN SUBSTRING_INDEX(number, '.', -1) ELSE '0' END AS UNSIGNED - ) ASC, - create_time asc + ) ASC + <if test="type!=1 and type!=null"> + ,sort asc + </if> + ,create_time asc + </select> <select id="selectCatalogueDataList" resultType="com.gkhy.exam.system.domain.vo.CatalogueDataVo"> SELECT diff --git a/multi-system/src/main/resources/mapper/system/ExStudentMapper.xml b/multi-system/src/main/resources/mapper/system/ExStudentMapper.xml index c18f90e..6d2af7b 100644 --- a/multi-system/src/main/resources/mapper/system/ExStudentMapper.xml +++ b/multi-system/src/main/resources/mapper/system/ExStudentMapper.xml @@ -85,7 +85,7 @@ </foreach> </if> </where> - order by s.id desc + order by s.id asc </select> <select id="selectStudentById" resultMap="ExStudentResult"> diff --git a/multi-system/src/main/resources/mapper/system/InternalAuditPersonMapper.xml b/multi-system/src/main/resources/mapper/system/InternalAuditPersonMapper.xml index 3c5c051..e936689 100644 --- a/multi-system/src/main/resources/mapper/system/InternalAuditPersonMapper.xml +++ b/multi-system/src/main/resources/mapper/system/InternalAuditPersonMapper.xml @@ -26,6 +26,6 @@ <if test="companyId!=null and companyId!=''"> and iap.company_id = #{companyId} </if> - ORDER BY create_time ASC + ORDER BY iap.create_time ASC </select> </mapper> diff --git a/multi-system/src/main/resources/mapper/system/SupplierSureCertifityMapper.xml b/multi-system/src/main/resources/mapper/system/SupplierSureCertifityMapper.xml new file mode 100644 index 0000000..7e7cb08 --- /dev/null +++ b/multi-system/src/main/resources/mapper/system/SupplierSureCertifityMapper.xml @@ -0,0 +1,21 @@ +<?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.gkhy.exam.system.mapper.SupplierSureCertifityMapper"> + + + <select id="selectCertifityList" resultType="com.gkhy.exam.system.domain.SupplierSureCertifity"> + SELECT + `id`, + `supplier_sure_id`, + `certifity_name`, + `file_path`, + `del_flag` + FROM + `supplier_sure_certifity` + WHERE + del_flag = 1 + <if test="supplierSureId!=null and supplierSureId!=''"> + and supplier_sure_id = #{supplierSureId} + </if> + </select> +</mapper> diff --git a/multi-system/src/main/resources/mapper/system/SupplierSureMapper.xml b/multi-system/src/main/resources/mapper/system/SupplierSureMapper.xml index 33283ad..dc6d84c 100644 --- a/multi-system/src/main/resources/mapper/system/SupplierSureMapper.xml +++ b/multi-system/src/main/resources/mapper/system/SupplierSureMapper.xml @@ -8,12 +8,11 @@ ss.`company_id`, sc.`name` AS company_name, ss.`supplier_name`, - ss.`supplier_type`, + ss.`supplier_addr`, + ss.`merito`, ss.`user`, ss.`phone`, - ss.`emil`, - ss.`merito`, - ss.`content`, + ss.`remark`, ss.`del_flag`, ss.`create_by`, ss.`create_time`, diff --git a/multi-system/src/main/resources/mapper/system/SupplierSurePerformanceMapper.xml b/multi-system/src/main/resources/mapper/system/SupplierSurePerformanceMapper.xml new file mode 100644 index 0000000..0ab7301 --- /dev/null +++ b/multi-system/src/main/resources/mapper/system/SupplierSurePerformanceMapper.xml @@ -0,0 +1,48 @@ +<?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.gkhy.exam.system.mapper.SupplierSurePerformanceMapper"> + <insert id="savePerformance"> + INSERT INTO `supplier_sure_performance` ( + `supplier_sure_id` + ) + VALUES + ( + #{id} + ) + </insert> + + + <select id="selectPerformanceList" resultType="com.gkhy.exam.system.domain.SupplierSurePerformance"> + + SELECT + ssp.`id`, + ssp.`supplier_sure_id`, + ssp.`name`, + ssp.`address`, + ssp.`people`, + ssp.`phone`, + ssp.`emil`, + ssp.`product`, + ssp.`type`, + ssp.`gist`, + ssp.`verify`, + ssp.`p1`, + ssp.`p2`, + ssp.`p3`, + ssp.`p4`, + ssp.`p5`, + ssp.`p6`, + ssp.`opinion`, + ssp.`review_users`, + ssp.`review_time`, + ssp.`review_mess`, + ssp.`check_id`, + su.`name` as check_name, + ssp.`check_time` + FROM + `supplier_sure_performance` ssp + left join sys_user su on ssp.check_id = su.id + WHERE + ssp.supplier_sure_id = #{supplierSureId} + </select> +</mapper> diff --git a/multi-system/src/main/resources/mapper/system/SupplierSureQualityMapper.xml b/multi-system/src/main/resources/mapper/system/SupplierSureQualityMapper.xml new file mode 100644 index 0000000..430b64a --- /dev/null +++ b/multi-system/src/main/resources/mapper/system/SupplierSureQualityMapper.xml @@ -0,0 +1,41 @@ +<?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.gkhy.exam.system.mapper.SupplierSureQualityMapper"> + + <insert id="saveQuality"> + INSERT INTO `supplier_sure_quality` ( + `supplier_sure_id` + ) + VALUES + ( + #{id} + ) + </insert> + + <select id="selectQualityList" resultType="com.gkhy.exam.system.domain.SupplierSureQuality"> + SELECT + `id`, + `supplier_sure_id`, + `name`, + `address`, + `person`, + `emil`, + `phone`, + `trait`, + `facility`, + `craft`, + `develop`, + `team_work`, + `qualification`, + `other_qualifi`, + `product`, + `other_product`, + `company_mess`, + `charge_name`, + `charge_time` + FROM + `supplier_sure_quality` + WHERE + supplier_sure_id = #{supplierSureId} + </select> +</mapper> -- Gitblit v1.9.2