Просмотр исходного кода

Merge remote-tracking branch 'origin/music_score' into music_score

Joburgess 3 лет назад
Родитель
Сommit
f891e04ac0

+ 11 - 0
mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -135,6 +135,9 @@ public class SysUser implements Serializable{
 
 	private String certificateType;
 
+	@ApiModelProperty(value = "社保部门id",required = false)
+	private Integer deptId;
+
 	@ApiModelProperty(value = "部门ids",required = false)
 	private String deptIds;
 
@@ -476,4 +479,12 @@ public class SysUser implements Serializable{
 	public void setPostDeptIds(String postDeptIds) {
 		this.postDeptIds = postDeptIds;
 	}
+
+	public Integer getDeptId() {
+		return deptId;
+	}
+
+	public void setDeptId(Integer deptId) {
+		this.deptId = deptId;
+	}
 }

+ 11 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/EmployeeDto.java

@@ -60,6 +60,9 @@ public class EmployeeDto {
 
     private String postalCode;
 
+    @ApiModelProperty(value = "社保部门id",required = false)
+    private Integer deptId;
+
     @ApiModelProperty(value = "OA部门ids",required = false)
     private String deptIds;
 
@@ -220,4 +223,12 @@ public class EmployeeDto {
     public void setPostDeptIds(String postDeptIds) {
         this.postDeptIds = postDeptIds;
     }
+
+    public Integer getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Integer deptId) {
+        this.deptId = deptId;
+    }
 }

+ 11 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Employee.java

@@ -54,6 +54,9 @@ public class Employee extends SysUser {
 	@ApiModelProperty(value = "证件号码",required = false)
 	private String certificateNum;
 
+	@ApiModelProperty(value = "社保部门id",required = false)
+	private Integer deptId;
+
 	@ApiModelProperty(value = "部门ids",required = false)
 	private String depIds;
 
@@ -270,4 +273,12 @@ public class Employee extends SysUser {
 	public void setPostDeptIds(String postDeptIds) {
 		this.postDeptIds = postDeptIds;
 	}
+
+	public Integer getDeptId() {
+		return deptId;
+	}
+
+	public void setDeptId(Integer deptId) {
+		this.deptId = deptId;
+	}
 }

+ 2 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/OaServiceImpl.java

@@ -28,6 +28,7 @@ public class OaServiceImpl implements OaUserService {
         oaUser.setNickName(employee.getRealName());
         oaUser.setPhone(employee.getPhone());
         oaUser.setSex(employee.getGender().toString());
+        oaUser.setDeptId(employee.getDeptId());
         oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
         oaUser.setAvatar(employee.getAvatar());
         oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));
@@ -47,6 +48,7 @@ public class OaServiceImpl implements OaUserService {
         oaUser.setNickName(employee.getRealName());
         oaUser.setPhone(employee.getPhone());
         oaUser.setSex(employee.getGender().toString());
+        oaUser.setDeptId(employee.getDeptId());
         oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
         oaUser.setAvatar(employee.getAvatar());
         oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicCompareRecordServiceImpl.java

@@ -60,7 +60,7 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 		if(Objects.nonNull(soundCompareInfo.getFile())){
 			sysMusicCompareRecord.setPlayTime(soundCompareInfo.getFile().length()/(SoundCompareHandler.soundCompareConfig.audioFormat.getFrameSize()*SoundCompareHandler.soundCompareConfig.audioFormat.getFrameRate()));
 		}
-		sysMusicCompareRecord.setFeature(FeatureType.CLOUD_STUDY_EVALUATION);
+		sysMusicCompareRecord.setMonday(LocalDate.now().with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue()).toString());
 		sysMusicCompareRecordDao.insert(sysMusicCompareRecord);
 	}
 

+ 8 - 3
mec-biz/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -23,6 +23,7 @@
         <result column="demission_date_" property="demissionDate"/>
         <result column="contact_address_" property="contactAddress"/>
         <result column="postal_code_" property="postalCode"/>
+        <result column="dept_id_" property="deptId"/>
         <result column="dept_ids_" property="deptIds"/>
         <result column="post_ids_" property="postIds"/>
         <result column="post_dept_ids_" property="postDeptIds"/>
@@ -75,9 +76,9 @@
         -->
         INSERT INTO employee
         (user_id_,organ_id_list_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,
-        entry_date_,certificate_type_,certificate_num_,update_time_,create_time_,introduction_,demission_date_,contact_address_,postal_code_,dept_ids_,post_ids_,post_dept_ids_)
+        entry_date_,certificate_type_,certificate_num_,update_time_,create_time_,introduction_,demission_date_,contact_address_,postal_code_,dept_id_,dept_ids_,post_ids_,post_dept_ids_)
         VALUES(#{userId},#{organIdList},#{jobNature},#{isProbationPeriod},#{educationBackground},#{graduateSchool},
-        #{technicalTitles},#{entryDate},#{certificateType},#{certificateNum},now(),now(),#{introduction},#{demissionDate},#{contactAddress},#{postalCode},#{deptIds},#{postIds},#{postDeptIds})
+        #{technicalTitles},#{entryDate},#{certificateType},#{certificateNum},now(),now(),#{introduction},#{demissionDate},#{contactAddress},#{postalCode},#{deptId},#{deptIds},#{postIds},#{postDeptIds})
     </insert>
     <insert id="batchAddEmployeeRole">
         INSERT INTO sys_user_role(user_id_,role_id_) values
@@ -136,6 +137,9 @@
             <if test="demissionDate != null">
                 demission_date_ = #{demissionDate},
             </if>
+            <if test="deptId != null">
+                dept_id_ = #{deptId},
+            </if>
             <if test="deptIds != null">
                 dept_ids_ = #{deptIds},
             </if>
@@ -201,6 +205,7 @@
         <result property="contactAddress" column="contact_address_"/>
         <result property="postalCode" column="postal_code_"/>
         <result property="organIdStr" column="organ_id_str_"/>
+        <result property="deptId" column="dept_id_"/>
         <result property="deptIds" column="dept_ids_"/>
         <result property="postIds" column="post_ids_"/>
         <result property="postDeptIds" column="post_dept_ids_"/>
@@ -214,7 +219,7 @@
     <select id="queryEmployByOrganId" resultMap="EmployeeDto">
         SELECT ue.*,ue.organ_id_ organ_id_str_,sr.role_name_,sr.id_ role_id_
         FROM (SELECT e.user_id_,su.real_name_,su.gender_,su.phone_,su.user_type_,e.job_nature_,su.lock_flag_,
-        e.entry_date_,e.demission_date_,e.organ_id_list_ organ_id_,e.create_time_,e.contact_address_,e.postal_code_,e.dept_ids_,e.post_ids_,e.post_dept_ids_
+        e.entry_date_,e.demission_date_,e.organ_id_list_ organ_id_,e.create_time_,e.contact_address_,e.postal_code_,e.dept_id_,e.dept_ids_,e.post_ids_,e.post_dept_ids_
         FROM employee e
         LEFT JOIN sys_user su ON e.user_id_ = su.id_
         <if test="roleId != null">

+ 2 - 2
mec-biz/src/main/resources/config/mybatis/SysMusicScoreAccompanimentMapper.xml

@@ -173,7 +173,7 @@
     <select id="querySubjectIds" resultMap="com.ym.mec.biz.dal.dao.SubjectDao.Subject">
 		SELECT s.* FROM sys_music_score_accompaniment sesa
 		LEFT JOIN `subject` s ON s.id_ = sesa.subject_id_
-		WHERE sesa.del_flag_ = 0
+		WHERE sesa.del_flag_ = 0 AND sesa.subject_id_ IS NOT NULL
 		GROUP BY sesa.subject_id_
 	</select>
 
@@ -196,7 +196,7 @@
 				AND sesc.parent_id_ = #{parentId}
 			</if>
 			<if test="subjectId != null">
-				AND sesa.subject_id_ = #{subjectId}
+				AND (sesa.subject_id_ = #{subjectId} OR sesa.subject_id_ IS NULL)
 			</if>
 			<if test="isShowFingering != null">
 				AND sesa.is_show_fingering_ = #{isShowFingering}

+ 10 - 0
mec-client-api/src/main/java/com/ym/mec/oa/entity/OAUser.java

@@ -15,6 +15,8 @@ public class OAUser {
 
     private String sex;
 
+    private Integer deptId;
+
     private List<Integer> deptIds;
 
     private List<Integer> postIds;
@@ -92,4 +94,12 @@ public class OAUser {
     public void setSex(String sex) {
         this.sex = sex;
     }
+
+    public Integer getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Integer deptId) {
+        this.deptId = deptId;
+    }
 }

+ 1 - 0
mec-web/src/main/java/com/ym/mec/web/controller/EmployeeController.java

@@ -139,6 +139,7 @@ public class EmployeeController extends BaseController {
             sysUser.setRoles(employeeDao.queryUserRole(sysUser.getId()));
             sysUser.setContactAddress(employee.getContactAddress());
             sysUser.setPostalCode(employee.getPostalCode());
+            sysUser.setDeptId(employee.getDeptId());
             sysUser.setDeptIds(employee.getDeptIds());
             sysUser.setPostIds(employee.getPostIds());
             sysUser.setBankCard(employee.getBankCard());