Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/purchase

purchase-admin/src/main/java/com/ozs/web/controller/base/BaseSupplierController.java

@@ -9,11 +9,13 @@ import com.ozs.common.annotation.Log;
 import com.ozs.common.constant.ModularConstans;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.common.core.page.TableDataInfo;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.base.domain.BaseSupplier;
 import com.ozs.base.service.BaseSupplierService;
+import com.ozs.framework.web.service.TokenService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +26,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -38,15 +42,21 @@ public class BaseSupplierController extends BaseController {
 
     @Autowired
     private BaseSupplierService baseSupplierService;
+    @Autowired
+    private TokenService tokenService;
 
     @ApiOperation(value = "新增供应商户", notes = "")
     @PostMapping("/insertBaseSupplier")
     @PreAuthorize("@ss.hasPermi('base:supplier:insertBaseSupplier')")
     @Log(title = ModularConstans.policy, businessType = BusinessType.INSERT)
-    public AjaxResult insertBaseSupplier(@RequestBody BaseSupplier baseSupplier) {
+    public AjaxResult insertBaseSupplier(@RequestBody BaseSupplier baseSupplier, HttpServletRequest request) {
         if (StringUtils.isNull(baseSupplier) || StringUtils.isNull(baseSupplier.getSupplierName())) {
             return error("供应商名称不能为空");
         }
+        //获取登录人
+        LoginUser loginUser = tokenService.getLoginUser(request);
+        baseSupplier.setCreated(String.valueOf(loginUser.getUserId()));
+        baseSupplier.setCreateTime(new Date());
         return toAjax(baseSupplierService.insertBaseSupplier(baseSupplier));
     }
 
@@ -65,10 +75,14 @@ public class BaseSupplierController extends BaseController {
     @PostMapping("/updateBaseSupplier")
     @PreAuthorize("@ss.hasPermi('base:supplier:updateBaseSupplier')")
     @Log(title = ModularConstans.policy, businessType = BusinessType.UPDATE)
-    public AjaxResult updateBaseSupplier(@RequestBody BaseSupplier baseSupplier) {
+    public AjaxResult updateBaseSupplier(@RequestBody BaseSupplier baseSupplier, HttpServletRequest request) {
         if (StringUtils.isNull(baseSupplier) || StringUtils.isNull(baseSupplier.getId())) {
             return error("修改数据及ID不能为空");
         }
+        //获取登录人
+        LoginUser loginUser = tokenService.getLoginUser(request);
+        baseSupplier.setUpdated(String.valueOf(loginUser.getUserId()));
+        baseSupplier.setUpdateTime(new Date());
         return toAjax(baseSupplierService.updateBaseSupplier(baseSupplier));
     }
 

purchase-admin/src/main/java/com/ozs/web/controller/plan/ProvisionalPlanController.java

@@ -64,6 +64,8 @@ public class ProvisionalPlanController extends BaseController {
         provisionalPlan.setCreateTime(new Date());
         // planType计划类型（0：季度计划，1：临时计划）
         provisionalPlan.setPlanType("1");
+        // 项目状态(0:计划待提交，1:计划待审核，2:计划已退回，3:计划已审核)
+        provisionalPlan.setProjectStatus("0");
         return toAjax(provisionalPlanService.save(provisionalPlan));
     }
 
@@ -140,7 +142,7 @@ public class ProvisionalPlanController extends BaseController {
         return success(provisionalPlan);
     }
 
-    @ApiOperation(value = "导入年临时计划")
+    @ApiOperation(value = "导入临时计划")
     @PostMapping("/importProvisionalPlan")
     @PreAuthorize("@ss.hasPermi('base:provisionalPlan:importProvisionalPlan')")
     @Log(title = ModularConstans.policy, businessType = BusinessType.INSERT)

purchase-admin/src/main/resources/logback.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-    <property name="log.path" value="/home/purchase/logs"/>
-    <!--    <property name="log.path" value="/Users/sunhuanhuan/Documents/project/106/文档/purchase/logs"/>-->
+    <!--    <property name="log.path" value="/home/purchase/logs"/>-->
+    <property name="log.path" value="/Users/sunhuanhuan/Documents/project/106/文档/purchase/logs"/>
     <!-- 日志输出格式 -->
     <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
 

purchase-system/src/main/java/com/ozs/base/domain/BaseSupplier.java

@@ -1,8 +1,13 @@
 package com.ozs.base.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.Date;
 
 /**
  * 供应商管理
@@ -10,19 +15,77 @@ import javax.validation.constraints.NotBlank;
  * @author sunhh
  */
 @Data
+@TableName("base_supplier")
 public class BaseSupplier {
+
+    @ApiModelProperty(value = "主键id")
+    @TableField("id")
     private Integer id;
-    // 供应商名称
+
     @NotBlank(message = "供应商名称不能为空")
+    @ApiModelProperty(value = "供应商名称不能为空")
+    @TableField("supplier_name")
     private String supplierName;
-    // 供应商负责人
+
+    @ApiModelProperty(value = "供应商负责人")
+    @TableField("supplier_responsible_person")
     private String supplierResponsiblePerson;
-    // 供应商地址
+
+    @ApiModelProperty(value = "供应商地址")
+    @TableField("supplier_address")
     private String supplierAddress;
-    // 供应商类型
+
+    @ApiModelProperty(value = "供应商类型")
+    @TableField("supplier_type")
     private String supplierType;
-    // 状态 黑白名单
+
+    @ApiModelProperty(value = "状态 黑名单0，白名单1")
+    @TableField("supplier_state")
     private String supplierState;
-    // 预先采购
+
+    @ApiModelProperty(value = "预先采购 关0，开1")
+    @TableField("supplier_advance_purchase")
     private String supplierAdvancePurchase;
+
+    @ApiModelProperty(value = "邮政编码")
+    @TableField("postal_code")
+    private String postalCode;
+
+    @ApiModelProperty(value = "项目联系人")
+    @TableField("project_person")
+    private String projectPerson;
+
+    @ApiModelProperty(value = "联系电话")
+    @TableField("telephone")
+    private String telephone;
+
+    @ApiModelProperty(value = "银行账户名称")
+    @TableField("bank_account_name")
+    private String bankAccountName;
+
+    @ApiModelProperty(value = "开户银行")
+    @TableField("bank_of_deposit")
+    private String bankOfDeposit;
+
+    @ApiModelProperty(value = "银行账号")
+    @TableField("bank_account_number")
+    private String bankAccountNumber;
+
+    @ApiModelProperty(value = "创建者")
+    @TableField("created")
+    private String created;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改者")
+    @TableField("updated")
+    private String updated;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+    @TableField("update_time")
+    private Date updateTime;
 }

purchase-system/src/main/java/com/ozs/base/domain/vo/BaseSupplierVo.java

@@ -1,22 +1,62 @@
 package com.ozs.base.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.vo.PageVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class BaseSupplierVo extends PageVo {
 
     @ApiModelProperty("供应商名称")
     private String supplierName;
+
     @ApiModelProperty("供应商负责人")
     private String supplierResponsiblePerson;
+
     @ApiModelProperty("供应商地址")
     private String supplierAddress;
+
     @ApiModelProperty("供应商类型")
     private String supplierType;
+
     @ApiModelProperty("状态 黑白名单")
     private String supplierState;
+
     @ApiModelProperty("预先采购")
     private String supplierAdvancePurchase;
+
+    @ApiModelProperty(value = "邮政编码")
+    private String postalCode;
+
+    @ApiModelProperty(value = "项目联系人")
+    private String projectPerson;
+
+    @ApiModelProperty(value = "联系电话")
+    private String telephone;
+
+    @ApiModelProperty(value = "银行账户名称")
+    private String bankAccountName;
+
+    @ApiModelProperty(value = "开户银行")
+    private String bankOfDeposit;
+
+    @ApiModelProperty(value = "银行账号")
+    private String bankAccountNumber;
+
+    @ApiModelProperty(value = "创建者")
+    private String created;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改者")
+    private String updated;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
 }

purchase-system/src/main/java/com/ozs/plan/doman/ProvisionalPlan.java

@@ -140,5 +140,5 @@ public class ProvisionalPlan {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "修改时间")
     @TableField("update_time")
-    private String updateTime;
+    private Date updateTime;
 }

purchase-system/src/main/java/com/ozs/plan/doman/vo/requestVo/ProvisionalPlanVo.java

@@ -99,5 +99,5 @@ public class ProvisionalPlanVo extends PageVo {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "修改时间")
-    private String updateTime;
+    private Date updateTime;
 }

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanQuarterServiceImpl.java

@@ -239,7 +239,7 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
         byId.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
         HashMap<String, Object> map = new HashMap<>();
         map.put("red_id", byId.getPlanPracticalId());
-        map.put("type", "1");
+        map.put("type", SysFileRefEnum.PLAN_TEMPORARY.getType());
         List<SysFileRef> fileRefs = sysFileRefMapper.selectByMap(map);
         List<SysFileInfo> fileInfos = new ArrayList<>();
         BeanUtils.copyProperties(byId, responseVo);
@@ -271,7 +271,7 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
         List<SysFileRef> sysFileRefs = quarterStandardVo.getSysFileRefs();
         HashMap<String, Object> map = new HashMap<>();
         map.put("red_id", quarters.getPlanPracticalId());
-        map.put("type", "1");
+        map.put("type", SysFileRefEnum.PLAN_TEMPORARY.getType());
         sysFileRefMapper.deleteByMap(map);
         if (!ObjectUtils.isEmpty(sysFileRefs)) {
             for (SysFileRef ref : sysFileRefs) {
@@ -413,6 +413,7 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
         if (ObjectUtils.isEmpty(byId.getPlanYearId())) {
             PlanYears ofYears = new PlanYears();
             BeanUtils.copyProperties(vo, ofYears);
+            ofYears.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
             planYearsMapper.insertPlanYears(ofYears);
             quarters.setPlanYearId(ofYears.getPlanYearId());
         }
@@ -542,25 +543,27 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
                 }
             }
             //项目属性是拼接的
-            if (planYear.getProjectAttr().length() > 1) {
-                StringBuilder builder = new StringBuilder();
-                String[] split = planYear.getProjectAttr().split(",");
-                for (String s : split) {
+            if (!ObjectUtils.isEmpty(planYear.getProjectAttr())) {
+                if (planYear.getProjectAttr().length() > 1) {
+                    StringBuilder builder = new StringBuilder();
+                    String[] split = planYear.getProjectAttr().split(",");
+                    for (String s : split) {
+                        for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
+                            if (s.equals(entry.getValue())) {
+                                builder.append(entry.getKey() + ",");
+                                break;
+                            }
+                        }
+                    }
+                    planYear.setProjectAttrStr(builder.toString());
+                } else {
                     for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
-                        if (s.equals(entry.getValue())) {
-                            builder.append(entry.getKey() + ",");
+                        if (planYear.getProjectAttr().equals(entry.getValue())) {
+                            planYear.setProjectAttrStr(entry.getKey());
                             break;
                         }
                     }
                 }
-                planYear.setProjectAttrStr(builder.toString());
-            } else {
-                for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
-                    if (planYear.getProjectAttr().equals(entry.getValue())) {
-                        planYear.setProjectAttrStr(entry.getKey());
-                        break;
-                    }
-                }
             }
             for (Map.Entry<String, String> entry : purchaseServices.entrySet()) {
                 if (planYear.getPurchaseServices().equals(entry.getValue())) {

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java

@@ -273,7 +273,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         byId.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
         HashMap<String, Object> map = new HashMap<>();
         map.put("red_id", byId.getPlanYearId());
-        map.put("type", "1");
+        map.put("type", SysFileRefEnum.PLAN_YEAR.getType());
         List<SysFileRef> fileRefs = sysFileRefMapper.selectByMap(map);
         List<SysFileInfo> fileInfos = new ArrayList<>();
         BeanUtils.copyProperties(byId, responseVo);
@@ -842,25 +842,27 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 }
             }
             //项目属性是拼接的
-            if (planYear.getProjectAttr().length() > 1) {
-                StringBuilder builder = new StringBuilder();
-                String[] split = planYear.getProjectAttr().split(",");
-                for (String s : split) {
+            if (!ObjectUtils.isEmpty(planYear.getProjectAttr())) {
+                if (planYear.getProjectAttr().length() > 1) {
+                    StringBuilder builder = new StringBuilder();
+                    String[] split = planYear.getProjectAttr().split(",");
+                    for (String s : split) {
+                        for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
+                            if (s.equals(entry.getValue())) {
+                                builder.append(entry.getKey() + ",");
+                                break;
+                            }
+                        }
+                    }
+                    planYear.setProjectAttrStr(builder.toString());
+                } else {
                     for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
-                        if (s.equals(entry.getValue())) {
-                            builder.append(entry.getKey() + ",");
+                        if (planYear.getProjectAttr().equals(entry.getValue())) {
+                            planYear.setProjectAttrStr(entry.getKey());
                             break;
                         }
                     }
                 }
-                planYear.setProjectAttrStr(builder.toString());
-            } else {
-                for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
-                    if (planYear.getProjectAttr().equals(entry.getValue())) {
-                        planYear.setProjectAttrStr(entry.getKey());
-                        break;
-                    }
-                }
             }
             for (Map.Entry<String, String> entry : purchaseServices.entrySet()) {
                 if (planYear.getPurchaseServices().equals(entry.getValue())) {

purchase-system/src/main/java/com/ozs/plan/service/impl/ProvisionalPlanServiceImpl.java

@@ -93,10 +93,10 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                     ofProvisionalPlan.setPurchaseMode(planPurchaseModesMap.get(ofProvisionalPlan.getPurchaseMode()));
                     //项目属性是多选字段
                     StringBuilder builder = new StringBuilder();
-                    if (ofProvisionalPlan.getProjectAttr().contains("，")) {
-                        String[] split = ofProvisionalPlan.getProjectAttr().split("，");
+                    if (ofProvisionalPlan.getProjectAttr().contains(",")) {
+                        String[] split = ofProvisionalPlan.getProjectAttr().split(",");
                         for (String s : split) {
-                            builder.append(projectAttributes.get(s) + "，");
+                            builder.append(projectAttributes.get(s) + ",");
                         }
                     } else {
                         builder.append(projectAttributes.get(ofProvisionalPlan.getProjectAttr()));