科目，增加修改时判断code重复性

mec-web/src/main/java/com/ym/mec/web/controller/SubjectController.java

@@ -21,6 +21,10 @@ public class SubjectController extends BaseController {
     @ApiOperation(value = "新增科目")
     @PostMapping("/add")
     public Object add(Subject subject){
+        Subject subjectByCode = subjectService.findByCode(subject.getCode());
+        if(subjectByCode != null){
+            return failed("科目编号已存在，请核查");
+        }
         Date date = new Date();
         subject.setCreateTime(date);
         subject.setUpdateTime(date);
@@ -38,6 +42,10 @@ public class SubjectController extends BaseController {
     @ApiOperation(value = "修改科目")
     @PutMapping("/update")
     public Object update(Subject subject){
+        Subject subjectByCode = subjectService.findByCode(subject.getCode());
+        if(subjectByCode != null && !subjectByCode.getId().equals(subject.getId())){
+            return failed("科目编号已存在，请核查");
+        }
         subject.setUpdateTime(new Date());
         subjectService.update(subject);
         return succeed();

mec-web/src/main/java/com/ym/mec/web/dal/dao/SubjectDao.java

@@ -2,6 +2,7 @@ package com.ym.mec.web.dal.dao;
 
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.web.dal.entity.Subject;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -20,4 +21,12 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
      * @return
      */
     List<Subject> findSubByChargeType(Integer chargeTypeId);
+
+    /**
+     * 根据科目code查科目
+     * @param code
+     * @return Subject
+     */
+    Subject findByCode(@Param("code") String code);
+
 }

mec-web/src/main/java/com/ym/mec/web/service/SubjectService.java

@@ -2,6 +2,7 @@ package com.ym.mec.web.service;
 
 import com.ym.mec.common.service.BaseService;
 import com.ym.mec.web.dal.entity.Subject;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -20,4 +21,12 @@ public interface SubjectService extends BaseService<Integer, Subject> {
      * @return
      */
     List<Subject> findSubByChargeType(Integer chargeTypeId);
+
+    /**
+     * 根据科目code查科目
+     * @param code
+     * @return
+     */
+    Subject findByCode(@Param("code") String code);
+
 }

mec-web/src/main/java/com/ym/mec/web/service/impl/SubjectServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ym.mec.web.service.impl;
 
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -31,4 +32,10 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject>  imple
 	public List<Subject> findSubByChargeType(Integer chargeTypeId) {
 		return subjectDao.findSubByChargeType(chargeTypeId);
 	}
+
+	@Override
+	public Subject findByCode(String code){
+		return subjectDao.findByCode(code);
+	}
+
 }

mec-web/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -84,4 +84,9 @@
     <select id="findSubByChargeType" resultMap="Subject">
         SELECT s.* FROM charge_type_subject_mapper ctsm LEFT JOIN `subject` s ON ctsm.subject_id_ = s.id_ WHERE ctsm.charge_type_id_ = #{chargeTypeId}
     </select>
+
+    <!-- 根据科目code查科目 -->
+    <select id="findByCode" resultMap="Subject">
+        SELECT * FROM subject WHERE code = #{code}
+    </select>
 </mapper>