UDI
/
spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

Browse Source
zhairh
zhengmingliang 3 years ago
parent 8ddaccbff1
commit bb0a7ef67c
6 changed files with 71 additions and 6 deletions
Show Stats Download Patch File Download Diff File

52
api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupManufacturerController.java
Unescape Escape View File

@ -6,17 +6,21 @@ import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.entity.auth.AuthAdmin;
import com.glxp.sale.admin.entity.info.CompanyEntity;
import com.glxp.sale.admin.entity.purchase.SupCertEntity;
import com.glxp.sale.admin.entity.purchase.SupCertSetEntity;
import com.glxp.sale.admin.entity.purchase.SupCompanyEntity;
import com.glxp.sale.admin.entity.purchase.SupManufacturerEntity;
import com.glxp.sale.admin.exception.JsonException;
import com.glxp.sale.admin.req.info.DeleteRequest;
import com.glxp.sale.admin.req.info.FilterCompanyRequest;
import com.glxp.sale.admin.req.purchase.FilterCertSetsRequest;
import com.glxp.sale.admin.req.purchase.FilterSupCertRequest;
import com.glxp.sale.admin.req.purchase.FilterSupCompanyRequest;
import com.glxp.sale.admin.req.purchase.FilterSupManufacturerRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.service.auth.AuthAdminService;
import com.glxp.sale.admin.service.info.CompanyService;
import com.glxp.sale.admin.service.purchase.SupCertService;
import com.glxp.sale.admin.service.purchase.SupCertSetService;
import com.glxp.sale.admin.service.purchase.SupCompanyService;
@ -51,6 +55,8 @@ public class SupManufacturerController {
private SupCompanyService supCompanyService;
@Resource
SupCertSetService supCertSetService;
@Resource
private CompanyService companyService;
@AuthRuleAnnotation("")
@GetMapping("/sup/manufacturer/getCompanyInfo")
@ -93,6 +99,22 @@ public class SupManufacturerController {
supManufacturerEntity.setCustomerId(customerId);
//判断用户名和社会信用代码不能重复
FilterSupManufacturerRequest filterSupManufacturerRequest=new FilterSupManufacturerRequest();
filterSupManufacturerRequest.setCompanyName(supManufacturerEntity.getCompanyName());
filterSupManufacturerRequest.setCustomerId(getCustomerId());
List<SupManufacturerEntity> companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest);
if(companyEntities.size()>0){
return ResultVOUtils.error(999,"企业名称不能重复！");
}
filterSupManufacturerRequest=new FilterSupManufacturerRequest();
filterSupManufacturerRequest.setCustomerId(getCustomerId());
filterSupManufacturerRequest.setCreditCode(supManufacturerEntity.getCreditCode());
companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest);
if(companyEntities.size()>0){
return ResultVOUtils.error(999,"统一社会信用代码不能重复！");
}
supManufacturerEntity.setCreateTime(new Date());
supManufacturerEntity.setUpdateTime(new Date());
@ -178,6 +200,36 @@ public class SupManufacturerController {
if (StrUtil.isEmpty(supManufacturerEntity.getManufacturerId()) || StrUtil.isEmpty(supManufacturerEntity.getCustomerId())) {
return ResultVOUtils.error(500, "参数错误！");
}
//判断用户名和社会信用代码不能重复
// FilterSupManufacturerRequest filterSupManufacturerRequest=new FilterSupManufacturerRequest();
// filterSupManufacturerRequest.setId(supManufacturerEntity.getId());
// List<SupManufacturerEntity> companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest);
// if(companyEntities.size()>0){
FilterSupManufacturerRequest filterSupManufacturerRequest=new FilterSupManufacturerRequest();
filterSupManufacturerRequest.setCompanyName(supManufacturerEntity.getCompanyName());
filterSupManufacturerRequest.setId(supManufacturerEntity.getId());
filterSupManufacturerRequest.setCustomerId(getCustomerId());
filterSupManufacturerRequest.setType(1);
List<SupManufacturerEntity> companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest);
if(companyEntities.size()>0){
return ResultVOUtils.error(999,"企业名称不能重复！");
}
filterSupManufacturerRequest=new FilterSupManufacturerRequest();
filterSupManufacturerRequest.setCustomerId(getCustomerId());
filterSupManufacturerRequest.setId(supManufacturerEntity.getId());
filterSupManufacturerRequest.setCreditCode(supManufacturerEntity.getCreditCode());
filterSupManufacturerRequest.setType(1);
companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest);
if(companyEntities.size()>0){
return ResultVOUtils.error(999,"统一社会信用代码不能重复！");
}
// }
//提交审核
if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE || supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) {
//判断是否上级供应商是否审核通过

7
api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java
Unescape Escape View File

@ -205,6 +205,13 @@ public class SupProductController {
return ResultVOUtils.error(500, "参数错误！");
}
//判断是不是存在草稿
List<SupCertEntity> supCertEntityList1 = supCertService.findAll(supProductEntity.getCustomerId(), supProductEntity.getManufacturerIdFk(), supProductEntity.getProductId());
for(SupCertEntity obj:supCertEntityList1){
if(obj.getAuditStatus()==0){
return ResultVOUtils.error(999,"证书中存在草稿不允许提交！");
}
}
//提交审核
if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) {
//判断是否上级供应商是否审核通过

1
api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupManufacturerEntity.java
Unescape Escape View File

@ -36,5 +36,6 @@ public class SupManufacturerEntity {
private Integer auditStatus;
private String supName;
private String auditComment;
private Integer auditType;
}

1
api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterSupManufacturerRequest.java
Unescape Escape View File

@ -14,4 +14,5 @@ public class FilterSupManufacturerRequest extends ListPageRequest {
private Integer auditStatus;
private String manufacturerId;
private String lastUpdateTime;
private Integer type;
}

10
api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml
Unescape Escape View File

@ -19,7 +19,7 @@
<if test="type != '' and type!=null">
and `type` = #{type}
</if>
<if test="auditStatus != null and auditStatus !=20 and auditStatus !=24">
<if test="auditStatus != null and auditStatus !=20 and auditStatus !=24 and auditStatus !=25">
and auditStatus = #{auditStatus}
</if>
<if test="auditStatus ==20">
@ -28,7 +28,9 @@
<if test="auditStatus ==24">
and (auditStatus = 2 or auditStatus=3 or auditStatus=5 or auditStatus=6)
</if>
<if test="auditStatus ==25">
and (auditStatus !=0)
</if>
</where>
ORDER BY id DESC
@ -68,8 +70,8 @@
<if test="remark != null">remark=#{remark},</if>
<if test="createTime != null">createTime=#{createTime},</if>
<if test="updateTime != null">updateTime=#{updateTime},</if>
<if test="vailDate != null">vailDate=#{vailDate},</if>
<if test="expireDate != null">expireDate=#{expireDate},</if>
vailDate=#{vailDate},
expireDate=#{expireDate},
<if test="type != null">`type`=#{type},</if>
<if test="manufacturerIdFk != null">`manufacturerIdFk`=#{manufacturerIdFk},</if>
<if test="productIdFk != null">`productIdFk`=#{productIdFk},</if>

6
api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml
Unescape Escape View File

@ -22,7 +22,7 @@
SELECT sup_manufacturer.* ,company.companyName as supName FROM sup_manufacturer
inner join company on sup_manufacturer.customerId = company.customerId
<where>
<if test="id != null and id != ''">
<if test="id != null and id != '' and type==null">
and id = #{id}
</if>
<if test="manufacturerId != null and manufacturerId != ''">
@ -59,7 +59,9 @@
<if test="lastUpdateTime!=null and lastUpdateTime!=''">
<![CDATA[ and DATE_FORMAT(sup_manufacturer.updateTime, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]>
</if>
<if test="type != null">
and id != #{id}
</if>
</where>
</select>

Write Preview
Loading…
Cancel
Save