Commit 29e2b3a1 authored by mengbali153's avatar mengbali153

非标产值

parent e2ac5f2a
...@@ -65,4 +65,8 @@ public class NonStandardValue implements Serializable { ...@@ -65,4 +65,8 @@ public class NonStandardValue implements Serializable {
@ApiModelProperty("account") @ApiModelProperty("account")
private String account; private String account;
@ApiModelProperty("部门id")
private Integer groups;
} }
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</sql> </sql>
<select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.NonStandardValueVo"> <select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.NonStandardValueVo">
select na.*,su.name as name,su.username as account select na.*,su.name as name,su.username as account,su.group_id as groups
from nonstandard_apply na from nonstandard_apply na
LEFT JOIN sys_user su ON su.id = na.user_id LEFT JOIN sys_user su ON su.id = na.user_id
<include refid="where"/> <include refid="where"/>
...@@ -49,7 +49,8 @@ ...@@ -49,7 +49,8 @@
na.final_value as 最终产值, na.final_value as 最终产值,
na.work_type as 工作类别, na.work_type as 工作类别,
na.work_description as 工作描述, na.work_description as 工作描述,
na.start_time as 开始时间 na.start_time as 开始时间,
su.group_id as 部门id
FROM nonstandard_apply na FROM nonstandard_apply na
left join sys_user su on na.user_id = su.id left join sys_user su on na.user_id = su.id
<include refid="where" /> <include refid="where" />
......
...@@ -83,6 +83,7 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap ...@@ -83,6 +83,7 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
finalNonStandardValue.setUserId(nonStandardValue.getUserId()); finalNonStandardValue.setUserId(nonStandardValue.getUserId());
finalNonStandardValue.setName(nonStandardValue.getName()); finalNonStandardValue.setName(nonStandardValue.getName());
finalNonStandardValue.setAccount(nonStandardValue.getAccount()); finalNonStandardValue.setAccount(nonStandardValue.getAccount());
finalNonStandardValue.setGroups(nonStandardValue.getId());
Integer newId=finalNonStandardValue.getId()+1; Integer newId=finalNonStandardValue.getId()+1;
finalNonStandardValue.setId(newId); finalNonStandardValue.setId(newId);
...@@ -125,7 +126,7 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap ...@@ -125,7 +126,7 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
if (!CollectionUtils.isEmpty(list)) { if (!CollectionUtils.isEmpty(list)) {
Map<String, Object> map = list.get(0); Map<String, Object> map = list.get(0);
String[] headers = new String[10]; String[] headers = new String[11];
headers[0] = "序号"; headers[0] = "序号";
headers[1] = "姓名"; headers[1] = "姓名";
headers[2] = "账户"; headers[2] = "账户";
...@@ -136,6 +137,7 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap ...@@ -136,6 +137,7 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
headers[7] = "工作类别"; headers[7] = "工作类别";
headers[8] = "工作描述"; headers[8] = "工作描述";
headers[9] = "开始时间"; headers[9] = "开始时间";
headers[10] = "部门id";
List<Object[]> datas = new ArrayList<>(list.size()); List<Object[]> datas = new ArrayList<>(list.size());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment