Browse Source

[feat]基础信息:出差单,添加供应商下拉框获取,添加自动生成差单编号方法。

dev
zhangsiqi 6 months ago
parent
commit
14a15733c4
  1. 7
      ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseEvectionFormController.java
  2. 2
      ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseEvectionFormService.java
  3. 9
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseEvectionFormServiceImpl.java
  4. 4
      ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/add.html
  5. 2
      ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html

7
ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseEvectionFormController.java

@ -147,5 +147,10 @@ public class BaseEvectionFormController extends BaseController
return toAjax(baseEvectionFormService.restoreBaseEvectionFormById(id)); return toAjax(baseEvectionFormService.restoreBaseEvectionFormById(id));
} }
@RequestMapping("/getId")
@ResponseBody
public AjaxResult getId()
{
return AjaxResult.success(baseEvectionFormService.getId());
}
} }

2
ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseEvectionFormService.java

@ -72,4 +72,6 @@ public interface IBaseEvectionFormService
* @return * @return
*/ */
int restoreBaseEvectionFormById(Long evectionId); int restoreBaseEvectionFormById(Long evectionId);
Object getId();
} }

9
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseEvectionFormServiceImpl.java

@ -1,6 +1,8 @@
package com.ruoyi.system.service.impl; package com.ruoyi.system.service.impl;
import java.util.List; import java.util.List;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.ShiroUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -22,6 +24,9 @@ public class BaseEvectionFormServiceImpl implements IBaseEvectionFormService
@Autowired @Autowired
private BaseEvectionFormMapper baseEvectionFormMapper; private BaseEvectionFormMapper baseEvectionFormMapper;
@Autowired
private RedisCache redisCache;
/** /**
* 查询出差单 * 查询出差单
* *
@ -123,4 +128,8 @@ public class BaseEvectionFormServiceImpl implements IBaseEvectionFormService
{ {
return baseEvectionFormMapper.restoreBaseEvectionFormById(evectionId); return baseEvectionFormMapper.restoreBaseEvectionFormById(evectionId);
} }
@Override
public Object getId() {
return redisCache.getCacheObject("CC");
}
} }

4
ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/add.html

@ -80,7 +80,7 @@
</div> </div>
</div> </div>
<!-- <div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">出行方式:</label> <label class="col-sm-3 control-label">出行方式:</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="travelMode" class="form-control" type="text"> <input name="travelMode" class="form-control" type="text">
@ -130,7 +130,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<input name="remark" class="form-control" type="text"> <input name="remark" class="form-control" type="text">
</div> </div>
</div> --> </div>
</form> </form>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />

2
ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html

@ -77,6 +77,8 @@
restoreUrl: prefix + "/restore/{id}", restoreUrl: prefix + "/restore/{id}",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
modalName: "出差单", modalName: "出差单",
pageSize: 5,
pageList: [5, 10, 25, 50],
columns: [ columns: [
{checkbox: true}, {checkbox: true},
{title: '出差单索引id',field: 'evectionId',visible: false}, {title: '出差单索引id',field: 'evectionId',visible: false},

Loading…
Cancel
Save