Merge remote-tracking branch 'origin/2021-04-21_music_replace' into 2021-04-21_music_replace

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ReplacementInstrumentActivity.java

@@ -12,6 +12,9 @@ public class ReplacementInstrumentActivity {
 	
 	/** 合作单位 */
 	private Integer cooperationOrganId;
+
+	/** 合作单位 */
+	private String cooperationOrganName;
 	
 	/**  */
 	private Integer userId;
@@ -42,7 +45,15 @@ public class ReplacementInstrumentActivity {
 	
 	/**  */
 	private java.util.Date updateTime;
-	
+
+	public String getCooperationOrganName() {
+		return cooperationOrganName;
+	}
+
+	public void setCooperationOrganName(String cooperationOrganName) {
+		this.cooperationOrganName = cooperationOrganName;
+	}
+
 	public void setId(Integer id){
 		this.id = id;
 	}

mec-student/src/main/java/com/ym/mec/student/controller/ReplacementInstrumentActivityController.java

@@ -2,11 +2,10 @@ package com.ym.mec.student.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.EmployeeDao;
-import com.ym.mec.biz.dal.entity.Employee;
+import com.ym.mec.biz.dal.entity.CooperationOrgan;
 import com.ym.mec.biz.dal.entity.ReplacementInstrumentActivity;
 import com.ym.mec.biz.dal.entity.Student;
-import com.ym.mec.biz.dal.page.ReplacementInstrumentActivityQueryInfo;
+import com.ym.mec.biz.service.CooperationOrganService;
 import com.ym.mec.biz.service.ReplacementInstrumentActivityService;
 import com.ym.mec.biz.service.StudentService;
 import com.ym.mec.common.controller.BaseController;
@@ -16,15 +15,11 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Arrays;
-import java.util.List;
-
 @RequestMapping("replacementInstrumentActivity")
 @Api(tags = "乐器置换调查问卷")
 @RestController
@@ -36,6 +31,8 @@ public class ReplacementInstrumentActivityController extends BaseController {
     private SysUserFeignService sysUserFeignService;
     @Autowired
     private StudentService studentService;
+    @Autowired
+    private CooperationOrganService cooperationOrganService;
 
     @ApiOperation(value = "新增调查问卷")
     @PostMapping("/insert")
@@ -64,6 +61,10 @@ public class ReplacementInstrumentActivityController extends BaseController {
             if(StringUtils.isNotEmpty(subjectIdList)){
                 replacementInstrumentActivity.setSubjectId(Integer.parseInt(subjectIdList.split(",")[0]));
             }
+            CooperationOrgan cooperationOrgan = cooperationOrganService.get(cooperationOrganId);
+            if(cooperationOrgan != null){
+                replacementInstrumentActivity.setCooperationOrganName(cooperationOrgan.getName());
+            }
         }
         return replacementInstrumentActivity;
     }