1 vuosi sitten
vanhempi
commit
43f13ebf78

+ 9 - 9
platform-dao/src/main/java/com/platform/dao/vo/export/longyanpurchaseorder/ExportLongYanPurchaseOrderVO.java

@@ -50,25 +50,25 @@ public class ExportLongYanPurchaseOrderVO implements Serializable {
     @Excel(name = "采购计划类型1:计划采购,2:临时采购,3:紧急采购", orderNum = "6",dicCode = "LONG_YAN_PURCHASE_TYPE")
     private Integer type;
 
-    /**
-     * 采购计划名称
-     */
-    @Excel(name = "采购计划名称", orderNum = "7")
-    private String orderName;
+//    /**
+//     * 采购计划名称
+//     */
+//    @Excel(name = "采购计划名称", orderNum = "7")
+//    private String orderName;
 
-    @Excel(name = "采购物料总数", orderNum = "8")
+    @Excel(name = "采购物料总数", orderNum = "7")
     private BigDecimal totalNum;
 
     /**
    *
    */
-          @Excel(name = "创建人", orderNum = "9")
+          @Excel(name = "创建人", orderNum = "8")
       private String createdUserName;
 
     /**
    *
    */
-          @Excel(name = "创建时间", orderNum = "10")
+          @Excel(name = "创建时间", orderNum = "9")
       private LocalDateTime createdTime;
 
     /**
@@ -97,7 +97,7 @@ public class ExportLongYanPurchaseOrderVO implements Serializable {
     /**
    * 备注
    */
-          @Excel(name = "备注", orderNum = "11")
+          @Excel(name = "备注", orderNum = "10")
       private String remark;
 
 

+ 1 - 1
platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -165,7 +165,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         // model.setSearchStartTime(DateUtils.getFirstDayOfThisMonth());
 //        model.setSearchEndTime(DateUtils.getLastDayOfThisMonth());
 //            if(!SecurityUtils.isRole(SysRoleCodeEnum.MM.name())){
-        dto.setRepairUserId(SecurityUtils.getUserInfo().getUserId());
+//        dto.setRepairUserId(SecurityUtils.getUserInfo().getUserId());
 
         dto.setAddCalendar(true);
         List<RepairApplicationFormVO> voList = mapper.selectPageList(dto);