update

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherCloseDto.java

@@ -31,10 +31,10 @@ public class TeacherCloseDto {
     @ApiModelProperty(value = "当前课时")
     private Integer currentClassTimes;
 
-    @ApiModelProperty(value = "签到状态:0异常，1正常")
+    @ApiModelProperty(value = "签到状态:0异常，1正常,3未签到")
     private Integer signInStatus;
 
-    @ApiModelProperty(value = "签退状态:0异常，1正常")
+    @ApiModelProperty(value = "签退状态:0异常，1正常,3未签到")
     private Integer signOutStatus;
 
     @ApiModelProperty(value = "实际结算薪水")

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

@@ -13,12 +13,32 @@ public class ChargeTypeOrganizationFee {
 
 	private Integer organId;
 
+	private String chargeTypeName;
+
+	private String organName;
+
 	private BigDecimal courseFee;
 
 	private Date createTime;
 
 	private Date updateTime;
 
+	public String getChargeTypeName() {
+		return chargeTypeName;
+	}
+
+	public void setChargeTypeName(String chargeTypeName) {
+		this.chargeTypeName = chargeTypeName;
+	}
+
+	public String getOrganName() {
+		return organName;
+	}
+
+	public void setOrganName(String organName) {
+		this.organName = organName;
+	}
+
 	public Integer getId() {
 		return id;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/ChargeTypeOrganizationFeeService.java

@@ -12,4 +12,8 @@ public interface ChargeTypeOrganizationFeeService extends BaseService<Integer, C
      * @return
      */
     ChargeTypeOrganizationFee findByOrganId(Integer chargeTypeId, Integer organId);
+
+    void add(ChargeTypeOrganizationFee chargeTypeOrganizationFee);
+
+    void updateFee(ChargeTypeOrganizationFee chargeTypeOrganizationFee);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ChargeTypeOrganizationFeeServiceImpl.java

@@ -4,9 +4,11 @@ import com.ym.mec.biz.dal.dao.ChargeTypeOrganizationFeeDao;
 import com.ym.mec.biz.dal.entity.ChargeTypeOrganizationFee;
 import com.ym.mec.biz.service.ChargeTypeOrganizationFeeService;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class ChargeTypeOrganizationFeeServiceImpl extends BaseServiceImpl<Integer, ChargeTypeOrganizationFee>  implements ChargeTypeOrganizationFeeService {
@@ -23,4 +25,24 @@ public class ChargeTypeOrganizationFeeServiceImpl extends BaseServiceImpl<Intege
 	public ChargeTypeOrganizationFee findByOrganId(Integer chargeTypeId, Integer organId) {
 		return chargeTypeOrganizationFeeDao.findByOrganId(chargeTypeId,organId);
 	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void add(ChargeTypeOrganizationFee chargeTypeOrganizationFee) {
+		try {
+			chargeTypeOrganizationFeeDao.insert(chargeTypeOrganizationFee);
+		}catch (Exception e){
+			throw new BizException("数据已存在");
+		}
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void updateFee(ChargeTypeOrganizationFee chargeTypeOrganizationFee) {
+		try {
+			chargeTypeOrganizationFeeDao.update(chargeTypeOrganizationFee);
+		}catch (Exception e){
+			throw new BizException("数据已存在");
+		}
+	}
 }

mec-biz/src/main/resources/config/mybatis/ChargeTypeOrganizationFeeMapper.xml

@@ -6,6 +6,8 @@
 	<resultMap type="com.ym.mec.biz.dal.entity.ChargeTypeOrganizationFee" id="chargeTypeOrganizationFee">
 		<result column="id_" property="id" />
 		<result column="charge_type_id_" property="chargeTypeId" />
+		<result column="charge_type_name_" property="chargeTypeName" />
+		<result column="organ_name_" property="organName" />
 		<result column="organ_id_" property="organId" />
 		<result column="course_fee_" property="courseFee" />
 		<result column="create_time_" property="createTime" />
@@ -58,7 +60,11 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="chargeTypeOrganizationFee" parameterType="map">
-		SELECT * FROM charge_type_organization_fee ORDER BY create_time_ DESC
+		SELECT ctof.*,o.name_ organ_name_,ct.name_ charge_type_name_
+		FROM charge_type_organization_fee ctof
+		LEFT JOIN organization o ON o.id_ = ctof.organ_id_
+		LEFT JOIN charge_type ct ON ctof.charge_type_id_ = ct.id_
+		ORDER BY ctof.create_time_ DESC
 		<include refid="global.limit" />
 	</select>
 

mec-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -304,7 +304,9 @@
     <select id="queryCloses" resultMap="TeacherCloseDto">
         SELECT cs.id_ course_schedule_id_,cs.class_date_,cs.start_class_time_,cg.name_ class_name_,cs.type_ class_type_,
         csts.teacher_role_,ta.current_class_times_,cg.total_class_times_,
-        ta.sign_in_status_,ta.sign_out_status_,csts.actual_salary_,csts.settlement_time_,csts.subsidy_
+        IF(ta.sign_in_status_ IS NULL,3,ta.sign_in_status_) sign_in_status_,
+        IF(ta.sign_out_status_ IS NULL,3,ta.sign_out_status_) sign_out_status_,
+        csts.actual_salary_,csts.settlement_time_,csts.subsidy_
         FROM course_schedule cs
         LEFT JOIN course_schedule_teacher_salary csts ON cs.id_ = csts.course_schedule_id_
         LEFT JOIN teacher_attendance ta ON cs.id_ = ta.course_schedule_id_ AND ta.teacher_id_ = csts.user_id_
@@ -504,12 +506,18 @@
             <if test="teacherRole != null and teacherRole != ''">
                 AND csts.teacher_role_ = #{teacherRole}
             </if>
-            <if test="signInStatus != null and signInStatus != ''">
+            <if test="signInStatus != null and signInStatus != 3">
                 AND ta.sign_in_status_ = #{signInStatus}
             </if>
-            <if test="signOutStatus != null and signOutStatus != ''">
+            <if test="signOutStatus != null and signOutStatus != 3">
                 AND ta.sign_out_status_ = #{signOutStatus}
             </if>
+            <if test="signOutStatus != null and signOutStatus = 3">
+                AND ta.sign_out_status_ IS NULL
+            </if>
+            <if test="signInStatus != null and signInStatus = 3">
+                AND ta.sign_in_status_ IS NULL
+            </if>
         </where>
     </sql>
 

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

@@ -30,7 +30,8 @@ public class ChargeTypeOrganizationFeeController extends BaseController {
 	@PostMapping(value = "add")
     @PreAuthorize("@pcs.hasPermissions('chargeTypeOrganizationFee/add')")
 	public Object add(ChargeTypeOrganizationFee chargeTypeOrganizationFee) {
-		return succeed(chargeTypeOrganizationFeeService.insert(chargeTypeOrganizationFee));
+		chargeTypeOrganizationFeeService.add(chargeTypeOrganizationFee);
+		return succeed();
 	}
 
 	@ApiOperation(value = "获取收费类型分部关联的默认课程费用")
@@ -52,7 +53,8 @@ public class ChargeTypeOrganizationFeeController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('chargeTypeOrganizationFee/update')")
 	public Object update(ChargeTypeOrganizationFee chargeTypeOrganizationFee) {
 		chargeTypeOrganizationFee.setUpdateTime(new Date());
-		return succeed(chargeTypeOrganizationFeeService.update(chargeTypeOrganizationFee));
+		chargeTypeOrganizationFeeService.updateFee(chargeTypeOrganizationFee);
+		return succeed();
 	}
 
 	@ApiOperation(value = "分页查询")