领料联调

bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java

@@ -43,15 +43,12 @@ public class LeaseApplyInfo extends BaseEntity{
     private String createBy;
 
     @ApiModelProperty(value = "实施单位")
-    @Excel(name = "实施单位")
     private String impUnitName;
 
     @ApiModelProperty(value = "合同主体")
-    @Excel(name = "合同主体")
     private String contractPart;
 
     @ApiModelProperty(value = "领料单位")
-    @Excel(name = "租赁单位")
     private String leaseUnit;
 
     @ApiModelProperty(value = "发料单位")
@@ -60,10 +57,23 @@ public class LeaseApplyInfo extends BaseEntity{
     @ApiModelProperty(value = "领料id")
     private Integer leaseUnitId;
 
+    @ApiModelProperty(value = "班组id")
+    private Long teamId;
+
+    @ApiModelProperty(value = "班组名称")
+    @Excel(name = "领料班组")
+    private String teamName;
+
     @ApiModelProperty(value = "租赁工程")
-    @Excel(name = "租赁工程")
     private String leaseProject;
 
+    @ApiModelProperty(value = "工程id")
+    private Long projectId;
+
+    @ApiModelProperty(value = "工程名称")
+    @Excel(name = "租赁工程")
+    private String projectName;
+
     @ApiModelProperty(value = "领料工程id")
     private Integer leaseProjectId;
 
@@ -73,19 +83,15 @@ public class LeaseApplyInfo extends BaseEntity{
     @ApiModelProperty(value = "领料人签名类型")
     private Byte leaseSignType;
 
-    /**
-     * 领料物资名称汇总
-     */
     @ApiModelProperty(value = "领料物资名称汇总")
+    @Excel(name = "领料工器具类型")
     private String maTypeNames;
 
     @ApiModelProperty(value = "协议号")
-    @Excel(name = "协议号")
     private String agreementCode;
 
     /** 任务编号: 领料单号 */
     @ApiModelProperty(value = "领料单号")
-    @Excel(name = "租赁申请单号")
     private String code;
 
     /** 任务ID */
@@ -93,7 +99,7 @@ public class LeaseApplyInfo extends BaseEntity{
     private Long taskId;
 
     /** 领料人 */
-    @Excel(name = "领料人")
+    @Excel(name = "班组长")
     @ApiModelProperty(value = "领料人")
     private String leasePerson;
 
@@ -195,21 +201,6 @@ public class LeaseApplyInfo extends BaseEntity{
     @ApiModelProperty(value = "往来单位")
     private String unitName;
 
-    @ApiModelProperty(value = "工程id")
-    private Long projectId;
-
-    /**
-     * 工程名称
-     */
-    @ApiModelProperty(value = "工程名称")
-    private String projectName;
-
-    @ApiModelProperty(value = "班组id")
-    private Long teamId;
-
-    @ApiModelProperty(value = "班组名称")
-    private String teamName;
-
     @ApiModelProperty(value = "领料方式（0 材料领料，1 工器具领料，2 系统推送）")
     private String leaseStyle;
 

bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyInfo.java

@@ -78,7 +78,7 @@ public class BackApplyInfo implements Serializable {
     private Long taskId;
 
     /** 退料人 */
-    @Excel(name = "退料人")
+    @Excel(name = "班组长")
     @ApiModelProperty(value = "退料人")
     private String backPerson;
 
@@ -92,7 +92,7 @@ public class BackApplyInfo implements Serializable {
     private Integer backNum;
 
     /** 联系方式 */
-    @Excel(name = "退料人电话")
+    @Excel(name = "班组长电话")
     @ApiModelProperty(value = "联系方式")
     private String phone;
 
@@ -118,12 +118,13 @@ public class BackApplyInfo implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date backTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
     @Excel(name = "创建人")
     private String createBy;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
     /** 1.机具分公司审核通过，2.机具分公司审批不通过，3.调试分公司审批通过，4.调试分公司审批不通过，5.出库进行中，6.出库完成 */
     @Excel(name = "状态")
     @ApiModelProperty(value = "1.机具分公司审核通过，2.机具分公司审批不通过，3.调试分公司审批通过，4.调试分公司审批不通过，5.出库进行中，6.出库完成")
@@ -141,6 +142,7 @@ public class BackApplyInfo implements Serializable {
     private String printStatus;
 
     @Size(max = 500, message = "备注长度不能超过500个字符")
+    @Excel(name = "备注")
     private String remark;
 
     @ApiModelProperty(value = "机具id")

bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyTotalInfo.java

@@ -77,7 +77,7 @@ public class BackApplyTotalInfo implements Serializable {
     private String proName;
 
     /** 退料人 */
-    @Excel(name = "退料人")
+    @Excel(name = "班组长")
     @ApiModelProperty(value = "退料人")
     private String backPerson;
 

bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/vo/LeaseTotalInfo.java

@@ -67,7 +67,7 @@ public class LeaseTotalInfo {
     private String projectName;
 
     @ApiModelProperty(value = "领料人")
-    @Excel(name = "领料人")
+    @Excel(name = "班组长")
     private String leasePerson;
 
     @ApiModelProperty(value = "出库人")

bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java

@@ -742,12 +742,12 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
             // 批量插入详情数据
             int count = leaseApplyDetailsMapper.insertLeaseApplyDetailsList(leaseApplyDetailsList);
             if (count > 0) {
-                return AjaxResult.success("新增任务成功");
+                return AjaxResult.success("新增任务成功", parentId);
             } else {
                 return AjaxResult.error("新增任务失败,lease_apply_detail详情表插入0条");
             }
         } else {
-            return AjaxResult.success("新增任务成功");
+            return AjaxResult.success("新增任务成功", parentId);
         }
     }