Преглед изворни кода

手机端修改请假和日报新增接口。

Wang-Xiao-Ran пре 1 година
родитељ
комит
94cb7973f6

+ 0 - 4
src/main/java/com/sooka/sponest/mobile/data/generalbusiness/AppLeaveController.java

@@ -34,11 +34,7 @@ public class AppLeaveController {
     @ApiOperation(value = "添加请假", notes = "添加请假")
     @PostMapping("addLeave")
     public AjaxResult addLeave(@RequestBody AppLeaveBo bo) {
-            bo.setId(IdUtils.simpleUUID());
             bo.setForestLeaveStatus("app_leave_1");
-            bo.setCreateBy(SecurityUtils.getUserId().toString());
-            bo.setCreateTime(DateUtils.getNowDate());
-            bo.setCreateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
             return remoteDataBaseService.addLeave(bo);
     }
 

+ 4 - 99
src/main/java/com/sooka/sponest/mobile/data/generalbusiness/domain/AppDailyBO.java

@@ -2,13 +2,15 @@ package com.sooka.sponest.mobile.data.generalbusiness.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.annotation.Excel;
-import com.sooka.sponest.mobile.base.domain.AppBaseBO;
+import com.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.Date;
 
-public class AppDailyBO extends AppBaseBO {
+@Data
+public class AppDailyBO extends BaseBusinessEntity {
 
 
     private static final long serialVersionUID = 1L;
@@ -48,101 +50,4 @@ public class AppDailyBO extends AppBaseBO {
     /** 部门名称 */
     @Excel(name = "部门名称")
     private String deptName;
-
-    public void setId(String id)
-    {
-        this.id = id;
-    }
-
-    public String getId()
-    {
-        return id;
-    }
-    public void setDataStatus(String dataStatus)
-    {
-        this.dataStatus = dataStatus;
-    }
-
-    public String getDataStatus()
-    {
-        return dataStatus;
-    }
-    public void setDataDeptId(Long dataDeptId)
-    {
-        this.dataDeptId = dataDeptId;
-    }
-
-    public Long getDataDeptId()
-    {
-        return dataDeptId;
-    }
-    public void setDailyType(String dailyType)
-    {
-        this.dailyType = dailyType;
-    }
-
-    public String getDailyType()
-    {
-        return dailyType;
-    }
-    public void setDailyTime(Date dailyTime)
-    {
-        this.dailyTime = dailyTime;
-    }
-
-    public Date getDailyTime()
-    {
-        return dailyTime;
-    }
-    public void setDailyTitle(String dailyTitle)
-    {
-        this.dailyTitle = dailyTitle;
-    }
-
-    public String getDailyTitle()
-    {
-        return dailyTitle;
-    }
-    public void setDailyContent(String dailyContent)
-    {
-        this.dailyContent = dailyContent;
-    }
-
-    public String getDailyContent()
-    {
-        return dailyContent;
-    }
-    public void setDeptId(Long deptId)
-    {
-        this.deptId = deptId;
-    }
-
-    public Long getDeptId()
-    {
-        return deptId;
-    }
-    public void setDeptName(String deptName)
-    {
-        this.deptName = deptName;
-    }
-
-    public String getDeptName()
-    {
-        return deptName;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("dataStatus", getDataStatus())
-                .append("dataDeptId", getDataDeptId())
-                .append("dailyType", getDailyType())
-                .append("dailyTime", getDailyTime())
-                .append("dailyTitle", getDailyTitle())
-                .append("dailyContent", getDailyContent())
-                .append("deptId", getDeptId())
-                .append("deptName", getDeptName())
-                .toString();
-    }
 }

+ 3 - 2
src/main/java/com/sooka/sponest/mobile/data/generalbusiness/domain/AppDailyVO.java

@@ -1,5 +1,6 @@
 package com.sooka.sponest.mobile.data.generalbusiness.domain;
 
+import com.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
 import com.sooka.sponest.mobile.base.domain.AppBaseVO;
 import lombok.Getter;
 import lombok.Setter;
@@ -8,7 +9,7 @@ import java.util.Date;
 
 @Getter
 @Setter
-public class AppDailyVO extends AppBaseVO {
+public class AppDailyVO extends BaseBusinessEntity {
 
     /**
      * 日报所属部门
@@ -25,9 +26,9 @@ public class AppDailyVO extends AppBaseVO {
     private String dailyContent;
 
     private String month;
+
     private String day;
 
     private String dataDeptName;
-    private Date createTime;
 
 }

+ 2 - 3
src/main/java/com/sooka/sponest/mobile/data/generalbusiness/service/impl/AppDailyServiceImpl.java

@@ -41,12 +41,11 @@ public class AppDailyServiceImpl implements AppDailyService {
             Integer i = 0;
             Integer repeatDaily = remoteDataBaseService.selectRepeatDaily(bo).getData();
             if (i.equals(repeatDaily)) {
-                bo.setId(IdUtils.simpleUUID());
-                bo.setCreateTime(DateUtils.getNowDate());
+//                bo.setCreateTime(DateUtils.getNowDate());
                 bo.setDeptId(appDailyVO.getDataDeptId());
+                bo.setDeptName(appDailyVO.getDataDeptName());
                 bo.setDailyTitle(appDailyVO.getDailyTitle());
                 bo.setDailyContent(appDailyVO.getDailyContent());
-                bo.setDeptName(appDailyVO.getDataDeptName());
                 bo.setDailyTime(appDailyVO.getCreateTime());
                 remoteDataBaseService.addDaily(bo);
                 return AjaxResult.success("添加成功");