非标产值

cement-business/src/main/java/cn/wise/sc/cement/business/entity/NonStandardValue.java

@@ -65,4 +65,8 @@ public class NonStandardValue implements Serializable {
 
 	@ApiModelProperty("account")
 	private String account;
+
+	@ApiModelProperty("部门id")
+	private Integer groups;
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/NonStandardValueMapper.xml

@@ -23,7 +23,7 @@
     </sql>
 
     <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
         LEFT JOIN sys_user su ON su.id = na.user_id
         <include refid="where"/>
@@ -49,7 +49,8 @@
         na.final_value as 最终产值,
         na.work_type as 工作类别,
         na.work_description as 工作描述,
-        na.start_time as 开始时间
+        na.start_time as 开始时间,
+        su.group_id as 部门id
         FROM nonstandard_apply na
         left join sys_user su on na.user_id = su.id
         <include refid="where" />

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardValueServiceImpl.java

@@ -83,6 +83,7 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
 					finalNonStandardValue.setUserId(nonStandardValue.getUserId());
 					finalNonStandardValue.setName(nonStandardValue.getName());
 					finalNonStandardValue.setAccount(nonStandardValue.getAccount());
+					finalNonStandardValue.setGroups(nonStandardValue.getId());
 
 					Integer newId=finalNonStandardValue.getId()+1;
 					finalNonStandardValue.setId(newId);
@@ -125,7 +126,7 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
 
 		if (!CollectionUtils.isEmpty(list)) {
 			Map<String, Object> map = list.get(0);
-			String[] headers = new String[10];
+			String[] headers = new String[11];
 			headers[0] = "序号";
 			headers[1] = "姓名";
 			headers[2] = "账户";
@@ -136,6 +137,7 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
 			headers[7] = "工作类别";
 			headers[8] = "工作描述";
 			headers[9] = "开始时间";
+			headers[10] = "部门id";
 
 
 			List<Object[]> datas = new ArrayList<>(list.size());