yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
ligaode 4 months ago
parent
0dbae15904 abdf76fac5
commit
059855489e
14 changed files with 360 additions and 260 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/costadjustmentsbill/CostAdjustmentsBillCastToKingDeeBillFields.java
  2. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/costadjustmentsbill/data_data.json
  3. 10
      anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatemanagement.js
  4. 10
      anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatemanagement.js
  5. 28
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
  6. 29
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue
  7. 4
      yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaMendApplyRest.java
  8. 33
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDetailsVo.java
  9. 30
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyInitVo.java
  10. 4
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyMapper.java
  11. 53
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyMapper.xml
  12. 32
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyQuery.java
  13. 16
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java
  14. 34
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyVo.java

21
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/costadjustmentsbill/CostAdjustmentsBillCastToKingDeeBillFields.java
View File

@ -6,10 +6,7 @@ import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.yxt.anrui.fin.biz.kingdee.KingDeeUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* 封装转换的类
@ -35,9 +32,7 @@ public class CostAdjustmentsBillCastToKingDeeBillFields {
JSONObject jsonFEntityData_ = JSONObject.parseObject(fEntityData_, Feature.OrderedField);
fEntityModel_ = KingDeeUtils.replaceTemplateParams(fEntityModel_, map_fEntityModel_);
JSONObject jsonFEntityModel_ = JSONObject.parseObject(fEntityModel_, Feature.OrderedField);
List<JSONObject> list_fEntity_ = new ArrayList<>();
//对模板字段赋值 根据传递进来的map数据的集合进行赋值
for (int i = 0; i < vehicleList.size(); i++) {
String fEntity_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/costadjustmentsbill/data_FEntity.json");
@ -49,11 +44,21 @@ public class CostAdjustmentsBillCastToKingDeeBillFields {
fEntity_ = KingDeeUtils.replaceTemplateParams(fEntity_, map_fEntity_);
list_fEntity_.add(JSONObject.parseObject(fEntity_, Feature.OrderedField));
}
jsonFEntityModel_.put("FEntity", JSONArray.parseArray(JSON.toJSONString(list_fEntity_)));
// jsonFEntityModel_.put("FEntity", JSONArray.parseArray(JSON.toJSONString(list_fEntity_)));
jsonFEntityModel_.put("FEntity", parseArrayOrderly(JSON.toJSONString(list_fEntity_)));
jsonFEntityData_.put("Model", JSONObject.parseObject(JSON.toJSONString(jsonFEntityModel_), Feature.OrderedField));
jsonObj.put("data", jsonFEntityData_.toJSONString());
return jsonObj.toJSONString();
}
/**
* fastjson JSONArray有序排序
*/
public static JSONArray parseArrayOrderly(String jsonStr){
//不直接转Array,调用parse()方法,当作JSONObject转,然后强制转换。
JSONArray array1 = (JSONArray) JSONObject.parse(jsonStr, Feature.OrderedField);
return array1;
}
}

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/costadjustmentsbill/data_data.json
View File

@ -4,7 +4,7 @@
"NeedReturnFields": [],
"IsDeleteEntry": "True",
"SubSystemId": "",
"IsVerifyBaseDataField": "false",
"IsVerifyBaseDataField": "True",
"IsEntryBatchFill": "True",
"ValidateFlag": "True",
"NumberSearch": "True",

10
anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatemanagement.js
View File

@ -53,6 +53,16 @@ export default {
method: 'get'
})
},
// 导出
exportExcel: function(data) {
return request({
url: '/scm/v1/scmvehrebate/excelList',
method: 'post',
data: data,
responseType: 'blob', // 表明返回服务器返回的数据类型
headers: { 'Content-Type': 'application/json' }
})
},
// 下载模板
downloadExcel: function() {
return request({

10
anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatemanagement.js
View File

@ -34,5 +34,15 @@ export default {
url: '/scm/v1/scmspecialrebate/fetchDetailsBySid/' + data,
method: 'get'
})
},
// 导出
exportExcel: function(data) {
return request({
url: '/scm/v1/scmspecialrebate/excelList',
method: 'post',
data: data,
responseType: 'blob', // 表明返回服务器返回的数据类型
headers: { 'Content-Type': 'application/json' }
})
}
}

28
anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
View File

@ -315,6 +315,9 @@ export default {
case 'doImport':
this.doImport()
break
case 'doExport':
this.doExport()
break
case 'doDel':
this.doDel()
break
@ -483,6 +486,31 @@ export default {
this.getList()
}
},
doExport() {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.exportExcel(this.listQuery.params).then((resp) => {
loading.close()
const blob = new Blob([resp], {
type: 'application/vnd.ms-excel'
})
const fileName = '单车返利' + '.xls'
const elink = document.createElement('a')
elink.download = fileName
elink.style.display = 'none'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
elink.click()
URL.revokeObjectURL(elink.href)
document.body.removeChild(elink)
}).catch(() => {
loading.close()
})
},
// 合计
getSummaries(param) {
const { columns, data } = param

29
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue
View File

@ -244,8 +244,8 @@ export default {
case 'toAdd':
this.toAdd()
break
case 'doImport':
this.doImport()
case 'doExport':
this.doExport()
break
case 'doDel':
this.doDel()
@ -357,6 +357,31 @@ export default {
}).catch(() => {
})
},
doExport() {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.exportExcel(this.listQuery.params).then((resp) => {
loading.close()
const blob = new Blob([resp], {
type: 'application/vnd.ms-excel'
})
const fileName = '专项返利' + '.xls'
const elink = document.createElement('a')
elink.download = fileName
elink.style.display = 'none'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
elink.click()
URL.revokeObjectURL(elink.href)
document.body.removeChild(elink)
}).catch(() => {
loading.close()
})
},
// 合计
getSummaries(param) {
const { columns, data } = param

4
yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaMendApplyRest.java
View File

@ -96,9 +96,9 @@ public class OaMendApplyRest {
@ApiOperation("初始化")
@GetMapping("/init")
public ResultBean<OaMendApplyInitVo> init(@RequestParam(value = "sid",required = false) String sid, @RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath) {
public ResultBean<OaMendApplyInitVo> init(@RequestParam(value = "sid", required = false) String sid, @RequestParam("orgPath") String orgPath) {
ResultBean rb = ResultBean.fireFail();
OaMendApplyInitVo vo = oaMendApplyService.init(sid, userSid, orgPath);
OaMendApplyInitVo vo = oaMendApplyService.init(sid, orgPath);
return rb.success().setData(vo);
}

33
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDetailsVo.java
View File

@ -55,39 +55,26 @@ import lombok.Data;
@ApiModel(value = "补卡申请 视图数据详情", description = "补卡申请 视图数据详情")
public class OaMendApplyDetailsVo implements Vo {
private String sid; // sid
private static final long serialVersionUID = -8377279007782913681L;
private String sid;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("补卡原因")
private String remarks;
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
private String billNo;
@ApiModelProperty("申请人")
private String createByName; // 申请人
private String createByName;
private String createBySid;
@ApiModelProperty("申请部门sid")
private String deptSid; // 申请部门sid
private String deptSid;
@ApiModelProperty("申请部门名称")
private String deptName; // 申请部门名称
private String deptName;
@ApiModelProperty("补卡时间")
private String time; // 补卡时间
private String time;
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
private String useOrgSid;
@ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("办结日期")
private Date finishTime;
@ApiModelProperty("实例id")
private String procInstId; // 实例id
@ApiModelProperty("流程定义id")
private String procDefId; // 流程定义id
@ApiModelProperty("任务id")
private String taskId; // 任务id
@ApiModelProperty("环节id")
private String nodeId; // 环节id
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
private String useOrgName;
@ApiModelProperty("图片")
private List<String> files = new ArrayList<>();
}

30
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyInitVo.java
View File

@ -51,36 +51,30 @@ import java.util.Date;
@ApiModel(value = "补卡申请 视图数据对象", description = "补卡申请 视图数据对象")
public class OaMendApplyInitVo implements Vo {
private static final long serialVersionUID = -2109900644174208483L;
private String sid; // sid
private String userSid;
private String createBySid;
private String orgPath;
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
private String billNo;
@ApiModelProperty("申请人")
private String createByName; // 申请人
private String createByName;
@ApiModelProperty("申请部门sid")
private String deptSid; // 申请部门sid
private String deptSid;
@ApiModelProperty("申请部门名称")
private String deptName; // 申请部门名称
private String deptName;
@ApiModelProperty("补卡时间")
private String time; // 补卡时间
private String time;
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
private String useOrgSid;
@ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("办结日期")
private Date finishTime;
private String useOrgName;
@ApiModelProperty("实例id")
private String procInstId; // 实例id
private String procInstId;
@ApiModelProperty("流程定义id")
private String procDefId; // 流程定义id
private String procDefId;
@ApiModelProperty("任务id")
private String taskId; // 任务id
@ApiModelProperty("环节id")
private String nodeId; // 环节id
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
private String taskId;
}

4
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyMapper.java
View File

@ -56,4 +56,8 @@ public interface OaMendApplyMapper extends BaseMapper<OaMendApply> {
int selectBySid(String join);
String selectNum(String billNo);
OaMendApplyDetailsVo fetchDetailsVoBySid(String sid);
OaMendApplyInitVo init(String sid);
}

53
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyMapper.xml
View File

@ -4,7 +4,26 @@
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.oa.biz.oamendapply.OaMendApplyVo">
SELECT * FROM oa_mend_apply <where> ${ew.sqlSegment} </where>
SELECT oa.sid,oa.remarks,
oa.time,
oa.formSid
ofm.billNo,
ofm.createByName,
ofm.deptSid,
ofm.deptName,
ofm.useOrgSid,
ofm.useOrgName,
DATE_FORMAT(ofm.finishTime) as finishTime,
ofm.procInstId,
ofm.procDefId,
ofm.taskId,
ofm.nodeId,
ofm.nodeState
FROM oa_mend_apply oa
left join oa_form ofm on oa.formSid = ofm.sid
<where>
${ew.sqlSegment}
</where>
</select>
<update id="updateFlowFiled">
@ -39,4 +58,36 @@
order by billNo desc
limit 1
</select>
<select id="fetchDetailsVoBySid" resultType="com.yxt.anrui.oa.biz.oamendapply.OaMendApplyDetailsVo">
select oa.sid,
oa.remarks,
ofm.billNo,
ofm.createByName,
ofm.createBySid,
ofm.deptSid,
ofm.deptName,
oa.time,
ofm.useOrgSid,
ofm.useOrgName
from oa_menu_apply oa
left join oa_form ofm on oa.formSid = ofm.sid
where oa.sid = #{sid}
</select>
<select id="init" resultType="com.yxt.anrui.oa.biz.oamendapply.OaMendApplyInitVo">
select oa.sid,
oa.remarks,
ofm.billNo,
ofm.createByName,
ofm.createBySid,
ofm.deptSid,
ofm.deptName,
oa.time,
ofm.useOrgSid,
ofm.useOrgName
from oa_menu_apply oa
left join oa_form ofm on oa.formSid = ofm.sid
where oa.sid = #{sid}
</select>
</mapper>

32
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyQuery.java
View File

@ -29,7 +29,9 @@ package com.yxt.anrui.oa.biz.oamendapply;
import com.yxt.common.core.query.Query;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -51,33 +53,9 @@ import lombok.Data;
@ApiModel(value = "补卡申请 查询条件", description = "补卡申请 查询条件")
public class OaMendApplyQuery implements Query {
private static final long serialVersionUID = -7211977992786497538L;
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("申请人")
private String createByName; // 申请人
@ApiModelProperty("申请部门sid")
private String deptSid; // 申请部门sid
@ApiModelProperty("申请部门名称")
private String deptName; // 申请部门名称
@ApiModelProperty("补卡时间")
private String time; // 补卡时间
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("办结日期")
private Date finishTimeStart; // 办结日期
private Date finishTimeEnd; // 办结日期
@ApiModelProperty("实例id")
private String procInstId; // 实例id
@ApiModelProperty("流程定义id")
private String procDefId; // 流程定义id
@ApiModelProperty("任务id")
private String taskId; // 任务id
@ApiModelProperty("环节id")
private String nodeId; // 环节id
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
private String billNo;
}

16
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java
View File

@ -101,6 +101,11 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
public PagerVo<OaMendApplyVo> listPageVo(PagerQuery<OaMendApplyQuery> pq) {
OaMendApplyQuery query = pq.getParams();
QueryWrapper<OaMendApply> qw = new QueryWrapper<>();
if (query != null) {
if (StringUtils.isNotBlank(query.getBillNo())) {
qw.like("ofm.billNo", query.getBillNo());
}
}
IPage<OaMendApply> page = PagerUtil.queryToPage(pq);
IPage<OaMendApplyVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<OaMendApplyVo> p = PagerUtil.pageToVo(pagging, null);
@ -201,6 +206,8 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
oaForm.setDeptSid(deptSid);
oaForm.setDeptName(deptName);
oaForm.setBillNo(billNo);
oaForm.setCreateOrgSid(useOrgSid);
oaForm.setCreateOrgName(organizationVo.getName());
// 获取用户信息
SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getCreateBySid()).getData();
@ -248,9 +255,7 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
}
public OaMendApplyDetailsVo fetchDetailsVoBySid(String sid) {
OaMendApply entity = fetchBySid(sid);
OaMendApplyDetailsVo vo = new OaMendApplyDetailsVo();
BeanUtil.copyProperties(entity, vo);
OaMendApplyDetailsVo vo = baseMapper.fetchDetailsVoBySid(sid);
List<OaAppendix> oaAppendices = oaAppendixService.fetchByLinkSid(sid);
List<String> files = new ArrayList<>();
for (OaAppendix oaAppendix : oaAppendices) {
@ -682,9 +687,8 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
return rb.success();
}
public OaMendApplyInitVo init(String sid, String userSid, String orgPath) {
OaMendApplyInitVo oaMendApplyInitVo = new OaMendApplyInitVo();
oaMendApplyInitVo.setUserSid(userSid);
public OaMendApplyInitVo init(String sid, String orgPath) {
OaMendApplyInitVo oaMendApplyInitVo = baseMapper.init(sid);
oaMendApplyInitVo.setOrgPath(orgPath);
return oaMendApplyInitVo;
}

34
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyVo.java
View File

@ -29,7 +29,9 @@ package com.yxt.anrui.oa.biz.oamendapply;
import com.yxt.common.core.vo.Vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -51,34 +53,36 @@ import lombok.Data;
@ApiModel(value = "补卡申请 视图数据对象", description = "补卡申请 视图数据对象")
public class OaMendApplyVo implements Vo {
private String sid; // sid
private static final long serialVersionUID = 5358032202923713923L;
private String sid;
private String remarks;
private String formSid;
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
private String billNo;
@ApiModelProperty("申请人")
private String createByName; // 申请人
private String createByName;
@ApiModelProperty("申请部门sid")
private String deptSid; // 申请部门sid
private String deptSid;
@ApiModelProperty("申请部门名称")
private String deptName; // 申请部门名称
private String deptName;
@ApiModelProperty("补卡时间")
private String time; // 补卡时间
private String time;
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
private String useOrgSid;
@ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private String useOrgName;
@ApiModelProperty("办结日期")
private Date finishTime;
private String finishTime;
@ApiModelProperty("实例id")
private String procInstId; // 实例id
private String procInstId;
@ApiModelProperty("流程定义id")
private String procDefId; // 流程定义id
private String procDefId;
@ApiModelProperty("任务id")
private String taskId; // 任务id
private String taskId;
@ApiModelProperty("环节id")
private String nodeId; // 环节id
private String nodeId;
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
private String nodeState;
}

Write Preview
Loading…
Cancel
Save