[BO] 임가현황 - 임가방문정보 작업 중
This commit is contained in:
@@ -1,7 +1,9 @@
|
||||
package app.module.admin.config.application.enums;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
@Getter
|
||||
@RequiredArgsConstructor
|
||||
@@ -10,4 +12,10 @@ public enum ManagementType {
|
||||
CALL("전화상담"),
|
||||
ETC("기타");
|
||||
private final String desc;
|
||||
|
||||
@JsonCreator
|
||||
public static ManagementType from(String value) {
|
||||
if (!StringUtils.hasText(value)) return null;
|
||||
return ManagementType.valueOf(value.toUpperCase());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.persistence;
|
||||
|
||||
import app.module.core.config.application.annotation.DeleteCommand;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain.RemoveHouseholdVisitInfosCmd;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.RemoveHouseholdVisitInfosPortOut;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class RemoveHouseholdVisitInfosDao implements RemoveHouseholdVisitInfosPortOut {
|
||||
private final RemoveHouseholdVisitInfosMapper mapper;
|
||||
|
||||
@Override
|
||||
@DeleteCommand
|
||||
public void operate(RemoveHouseholdVisitInfosCmd cmd) {
|
||||
mapper.removeHouseholdVisitInfos(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain.RemoveHouseholdVisitInfosCmd;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface RemoveHouseholdVisitInfosMapper {
|
||||
void removeHouseholdVisitInfos(RemoveHouseholdVisitInfosCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.web;
|
||||
|
||||
import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.RemoveHouseholdVisitInfosPortIn;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain.RemoveHouseholdVisitInfosCmd;
|
||||
import app.module.core.config.application.util.MessageUtil;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.web.model.RemoveHouseholdVisitInfosReqVO;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.web.model.RemoveHouseholdVisitInfosResVO;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
class RemoveHouseholdVisitInfosController {
|
||||
|
||||
private final MessageUtil messageUtil;
|
||||
private final RemoveHouseholdVisitInfosPortIn portIn;
|
||||
|
||||
@DeleteMapping(path = "/api/visitInfo/remove")
|
||||
ResponseEntity<?> operate(
|
||||
@Valid @RequestBody RemoveHouseholdVisitInfosReqVO reqVO,
|
||||
BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body(bindingResult);
|
||||
}
|
||||
|
||||
portIn.operate(
|
||||
new RemoveHouseholdVisitInfosCmd(reqVO.getHouseholdSeq(), reqVO.getRemoveIds()));
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK).body(new RemoveHouseholdVisitInfosResVO(
|
||||
messageUtil.getMessage("operation.common.remove.done")));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.web.model;
|
||||
|
||||
import java.util.List;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class RemoveHouseholdVisitInfosReqVO {
|
||||
private Long householdSeq;
|
||||
private List<Long> removeIds;
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.web.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class RemoveHouseholdVisitInfosResVO {
|
||||
private String message;
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports;
|
||||
|
||||
import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain.RemoveHouseholdVisitInfosCmd;
|
||||
|
||||
public interface RemoveHouseholdVisitInfosPortIn {
|
||||
void operate(RemoveHouseholdVisitInfosCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports;
|
||||
|
||||
import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain.RemoveHouseholdVisitInfosCmd;
|
||||
|
||||
public interface RemoveHouseholdVisitInfosPortOut {
|
||||
void operate(RemoveHouseholdVisitInfosCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain.RemoveHouseholdVisitInfosCmd;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.RemoveHouseholdVisitInfosPortIn;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.RemoveHouseholdVisitInfosPortOut;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class RemoveHouseholdVisitInfosService implements RemoveHouseholdVisitInfosPortIn {
|
||||
private final RemoveHouseholdVisitInfosPortOut portOut;
|
||||
|
||||
@Override
|
||||
public void operate(RemoveHouseholdVisitInfosCmd cmd) {
|
||||
portOut.operate(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain;
|
||||
|
||||
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
||||
import java.util.List;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
public class RemoveHouseholdVisitInfosCmd extends AuditCommand {
|
||||
private Long householdSeq;
|
||||
private List<Long> removeIds;
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.persistence;
|
||||
|
||||
import app.module.core.config.application.util.AuditUtil;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain.SaveHouseholdVisitInfoCmd;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.SaveHouseholdVisitInfoPortOut;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class SaveHouseholdVisitInfoDao implements SaveHouseholdVisitInfoPortOut {
|
||||
private final SaveHouseholdVisitInfoMapper mapper;
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public void operate(SaveHouseholdVisitInfoCmd cmd) {
|
||||
if (cmd.getVisitInfoId() != null) {
|
||||
mapper.findById(cmd.getHouseholdSeq())
|
||||
.ifPresentOrElse(
|
||||
v -> mapper.updateHouseholdVisitInfo(AuditUtil.update(cmd)),
|
||||
() -> { throw new IllegalArgumentException("방문정보가 없습니다."); }
|
||||
);
|
||||
} else {
|
||||
mapper.createHouseholdVisitInfo(AuditUtil.create(cmd));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain.SaveHouseholdVisitInfoCmd;
|
||||
import java.util.Optional;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface SaveHouseholdVisitInfoMapper {
|
||||
Optional<Long> findById(Long id);
|
||||
void createHouseholdVisitInfo(SaveHouseholdVisitInfoCmd cmd);
|
||||
void updateHouseholdVisitInfo(SaveHouseholdVisitInfoCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web;
|
||||
|
||||
import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.SaveHouseholdVisitInfoPortIn;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain.SaveHouseholdVisitInfoCmd;
|
||||
import app.module.core.config.application.util.MessageUtil;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.model.SaveHouseholdVisitInfoReqVO;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.model.SaveHouseholdVisitInfoResVO;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.validator.SaveHouseholdVisitInfoValidator;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
class SaveHouseholdVisitInfoController {
|
||||
private final SaveHouseholdVisitInfoValidator validator;
|
||||
private final SaveHouseholdVisitInfoPortIn portIn;
|
||||
private final MessageUtil messageUtil;
|
||||
|
||||
@PostMapping(path = "/api/visitInfo/save")
|
||||
ResponseEntity<?> operate(
|
||||
@Valid @RequestBody SaveHouseholdVisitInfoReqVO reqVO,
|
||||
BindingResult bindingResult) {
|
||||
validator.validate(reqVO, bindingResult);
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
|
||||
.body(bindingResult.getAllErrors().get(0).getDefaultMessage());
|
||||
}
|
||||
|
||||
portIn.operate(new SaveHouseholdVisitInfoCmd(
|
||||
reqVO.getVisitInfoId(),
|
||||
reqVO.getHouseholdSeq(),
|
||||
reqVO.getVisitDate(),
|
||||
reqVO.getManagementType().name(),
|
||||
reqVO.getContent(),
|
||||
reqVO.getIsGiftSent()));
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK).body(
|
||||
new SaveHouseholdVisitInfoResVO(messageUtil.getMessage("operation.common.save.done")));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.model;
|
||||
|
||||
import app.module.admin.config.application.enums.ManagementType;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import groovy.transform.NamedParam;
|
||||
import java.util.Date;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class SaveHouseholdVisitInfoReqVO {
|
||||
private Long visitInfoId;
|
||||
private Long householdSeq;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date visitDate;
|
||||
private ManagementType managementType;
|
||||
private String content;
|
||||
private Boolean isGiftSent;
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class SaveHouseholdVisitInfoResVO {
|
||||
private String message;
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.validator;
|
||||
|
||||
import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.model.SaveHouseholdVisitInfoReqVO;
|
||||
import java.util.Date;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.util.StringUtils;
|
||||
import org.springframework.validation.Errors;
|
||||
import org.springframework.validation.Validator;
|
||||
|
||||
@Component
|
||||
public class SaveHouseholdVisitInfoValidator implements Validator {
|
||||
|
||||
@Override
|
||||
public boolean supports(Class<?> clazz) {
|
||||
return SaveHouseholdVisitInfoReqVO.class.equals(clazz);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void validate(Object target, Errors errors) {
|
||||
SaveHouseholdVisitInfoReqVO vo = (SaveHouseholdVisitInfoReqVO) target;
|
||||
|
||||
if (vo.getHouseholdSeq() == null) {
|
||||
errors.reject("householdSeq", "임가 정보가 없습니다.");
|
||||
return;
|
||||
}
|
||||
|
||||
if (vo.getVisitDate() == null) {
|
||||
errors.reject("visitDate", "방문일자를 입력해 주세요.");
|
||||
return;
|
||||
}
|
||||
|
||||
if (vo.getVisitDate().after(new Date())) {
|
||||
errors.reject("visitDate", "미래 날짜는 입력할 수 없습니다.");
|
||||
return;
|
||||
}
|
||||
|
||||
if (vo.getManagementType() == null) {
|
||||
errors.reject("managementType", "방문조사 유형을 선택해 주세요.");
|
||||
}
|
||||
|
||||
if (!StringUtils.hasText(vo.getContent())) {
|
||||
errors.reject("content", "내용을 입력해 주세요.");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports;
|
||||
|
||||
import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain.SaveHouseholdVisitInfoCmd;
|
||||
|
||||
public interface SaveHouseholdVisitInfoPortIn {
|
||||
void operate(SaveHouseholdVisitInfoCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports;
|
||||
|
||||
import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain.SaveHouseholdVisitInfoCmd;
|
||||
|
||||
public interface SaveHouseholdVisitInfoPortOut {
|
||||
void operate(SaveHouseholdVisitInfoCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain.SaveHouseholdVisitInfoCmd;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.SaveHouseholdVisitInfoPortIn;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.SaveHouseholdVisitInfoPortOut;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class SaveHouseholdVisitInfoService implements SaveHouseholdVisitInfoPortIn {
|
||||
private final SaveHouseholdVisitInfoPortOut portOut;
|
||||
|
||||
@Override
|
||||
public void operate(SaveHouseholdVisitInfoCmd cmd) {
|
||||
portOut.operate(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain;
|
||||
|
||||
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
||||
import java.util.Date;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
public class SaveHouseholdVisitInfoCmd extends AuditCommand {
|
||||
private Long visitInfoId;
|
||||
private Long householdSeq;
|
||||
private Date visitDate;
|
||||
private String managementType;
|
||||
private String content;
|
||||
private Boolean isGiftSent;
|
||||
}
|
||||
@@ -44,6 +44,7 @@
|
||||
AND bat.household_seq = #{householdSeq}
|
||||
AND bat.month = #{recordMonth}
|
||||
AND bat.is_deleted = false
|
||||
ORDER BY bat.created_at
|
||||
</select>
|
||||
|
||||
<select id="getBankAutoTransferExpenseRecords"
|
||||
@@ -78,5 +79,6 @@
|
||||
AND bat.household_seq = #{householdSeq}
|
||||
AND bat.month = #{recordMonth}
|
||||
AND bat.is_deleted = false
|
||||
ORDER BY bat.created_at
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -48,6 +48,7 @@
|
||||
AND ui_unit.id = di.unit_code
|
||||
WHERE di.daily_record_seq = #{recordSeq}
|
||||
AND di.is_deleted = false
|
||||
ORDER BY di.created_at
|
||||
</select>
|
||||
|
||||
<select id="getDailyWorkRecords"
|
||||
@@ -89,6 +90,7 @@
|
||||
AND ui_harvest.id = dw.harvest_unit_code
|
||||
WHERE dw.daily_record_seq = #{recordSeq}
|
||||
AND dw.is_deleted = false
|
||||
ORDER BY dw.created_at
|
||||
</select>
|
||||
|
||||
<select id="getDailyExpenseRecords"
|
||||
@@ -116,6 +118,7 @@
|
||||
AND ui_unit.id = de.unit_code
|
||||
WHERE de.daily_record_seq = #{recordSeq}
|
||||
AND de.is_deleted = false
|
||||
ORDER BY de.created_at
|
||||
</select>
|
||||
|
||||
<select id="getDailyPowerRecords"
|
||||
@@ -130,6 +133,7 @@
|
||||
FROM daily_power dp
|
||||
WHERE dp.daily_record_seq = #{recordSeq}
|
||||
AND dp.is_deleted = false
|
||||
ORDER BY dp.created_at
|
||||
</select>
|
||||
|
||||
<select id="getDailyForestryRecords"
|
||||
@@ -154,6 +158,7 @@
|
||||
AND ui_unit.id = df.unit_code
|
||||
WHERE df.daily_record_seq = #{recordSeq}
|
||||
AND df.is_deleted = false
|
||||
ORDER BY df.created_at
|
||||
</select>
|
||||
|
||||
<select id="getDailyFarmingRecords"
|
||||
@@ -184,6 +189,7 @@
|
||||
AND ui_unit.id = df.unit_code
|
||||
WHERE df.daily_record_seq = #{recordSeq}
|
||||
AND df.is_deleted = false
|
||||
ORDER BY df.created_at
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@@ -68,5 +68,6 @@
|
||||
WHERE df.household_seq = #{householdSeq}
|
||||
AND df.month = #{recordMonth}
|
||||
AND df.is_deleted = false
|
||||
ORDER BY df.created_at
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -16,5 +16,7 @@
|
||||
FROM household_visit hv
|
||||
WHERE household_seq = #{householdSeq}
|
||||
AND TO_CHAR(visit_date, 'YYYYMM') = #{recordMonth}
|
||||
AND hv.is_deleted = false
|
||||
ORDER BY hv.created_at
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper
|
||||
namespace="app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.persistence.RemoveHouseholdVisitInfosMapper">
|
||||
<update id="removeHouseholdVisitInfos">
|
||||
/* removeHouseholdVisitInfos : 임가방문정보 삭제 */
|
||||
UPDATE household_visit
|
||||
SET <include refid="common.fields.DeleteBaseSet"/>
|
||||
WHERE id IN
|
||||
<foreach collection="removeIds" item="id" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</update>
|
||||
</mapper>
|
||||
@@ -0,0 +1,47 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper
|
||||
namespace="app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.persistence.SaveHouseholdVisitInfoMapper">
|
||||
<insert id="createHouseholdVisitInfo">
|
||||
/* createHouseholdVisitInfo : 임가방문정보 등록 */
|
||||
INSERT INTO household_visit
|
||||
(
|
||||
household_seq,
|
||||
visit_date,
|
||||
management_type,
|
||||
is_gift_sent,
|
||||
content,
|
||||
<include refid="common.fields.CreateUpdateBaseColumns"/>
|
||||
)
|
||||
VALUES
|
||||
(
|
||||
#{householdSeq},
|
||||
#{visitDate},
|
||||
#{managementType},
|
||||
#{isGiftSent},
|
||||
#{content},
|
||||
<include refid="common.fields.CreateUpdateBaseValues"/>
|
||||
)
|
||||
</insert>
|
||||
|
||||
<update id="updateHouseholdVisitInfo">
|
||||
/* updateHouseholdVisitInfo : 임가방문정보 수정 */
|
||||
UPDATE household_visit
|
||||
SET
|
||||
visit_date = #{visitDate},
|
||||
management_type = #{managementType},
|
||||
is_gift_sent = #{isGiftSent},
|
||||
content = #{content},
|
||||
<include refid="common.fields.UpdateBaseSet"/>
|
||||
WHERE id = #{visitInfoId}
|
||||
</update>
|
||||
|
||||
<select id="findById" resultType="java.lang.Long">
|
||||
/* findById : 임가방문정보 조회 */
|
||||
SELECT id
|
||||
FROM household_visit
|
||||
WHERE id = #{id}
|
||||
AND is_deleted = false
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -380,7 +380,8 @@
|
||||
|
||||
// 현재 로그인한 유저의 역할
|
||||
const isResearcher = f.userRole.value === 'ROLE_RESEARCHER';
|
||||
const colspanLength = isResearcher ? 13 : 15;
|
||||
// const colspanLength = isResearcher ? 13 : 15; <!-- TODO : 2차 오픈 -->
|
||||
const colspanLength = isResearcher ? 10 : 12;
|
||||
|
||||
// 조사원일 경우 조사원이름, 번호 칼럼 hide
|
||||
$('.hide-role-researcher').toggle(!isResearcher);
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
</div>
|
||||
<div class="modal-content">
|
||||
<div class="modal-content-inner">
|
||||
<table class="type-form">
|
||||
<table class="type-form confirm">
|
||||
<tbody>
|
||||
|
||||
<tr>
|
||||
@@ -125,6 +125,7 @@
|
||||
// 임가방문정보 모달창 띄우기
|
||||
const showVisitInfoModal = (id) => {
|
||||
const f = document.reqVisitForm;
|
||||
f.householdSeq.value = householdSeq;
|
||||
|
||||
resetForm();
|
||||
|
||||
@@ -177,21 +178,22 @@
|
||||
|
||||
console.log("dataOj", dataOj);
|
||||
|
||||
// ajaxUtil._ajaxMethod(
|
||||
// '/api/visitInfo/create',
|
||||
// JSON.stringify(dataOj),
|
||||
// (response) => { // 성공
|
||||
// alert("등록이 완료되었습니다.");
|
||||
// location.href = '/households';
|
||||
// },
|
||||
// function (code, rstData) {
|
||||
// if(code == 422) alert(rstData.responseText);
|
||||
// if(code == 400) alert(rstData.responseJSON.message); //임가번호 중복체크
|
||||
// },
|
||||
// 'post',
|
||||
// 'json',
|
||||
// { handle422Type: 'alert' }
|
||||
// );
|
||||
ajaxUtil._ajaxMethod(
|
||||
'/api/visitInfo/save',
|
||||
JSON.stringify(dataOj),
|
||||
(response) => { // 성공
|
||||
alert("등록이 완료되었습니다.");
|
||||
document.querySelector(".modal-visit-info").ui.close();
|
||||
getVisitInfo(0);
|
||||
},
|
||||
function (code, rstData) {
|
||||
if(code == 422) alert(rstData.responseText);
|
||||
if(code == 400) alert(rstData.responseJSON.message); //임가번호 중복체크
|
||||
},
|
||||
'post',
|
||||
'json',
|
||||
{ handle422Type: 'alert' }
|
||||
);
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -215,11 +217,6 @@
|
||||
datepickerInstance.setDate(new Date(), { render: true });
|
||||
}
|
||||
});
|
||||
|
||||
$(document).ready(() => {
|
||||
const reqForm = document.reqForm;
|
||||
document.reqVisitForm.householdSeq.value = reqForm.householdSeq.value;
|
||||
});
|
||||
</script>
|
||||
</div>
|
||||
</html>
|
||||
@@ -10,7 +10,7 @@
|
||||
<h3></h3>
|
||||
<div class="component-btns bottom-btn-group">
|
||||
<div class="btns-row align-right">
|
||||
<button type="button" class="btn small btn-secondary">
|
||||
<button type="button" class="btn small btn-secondary" onclick="goDeleteVisitInfo();">
|
||||
<span class=" btn-txt">삭제</span>
|
||||
</button>
|
||||
<button type="button" class="btn small btn-primary" onclick="showVisitInfoModal();">
|
||||
@@ -68,7 +68,7 @@
|
||||
<td>
|
||||
<div class="component-input">
|
||||
<label class="checkbox-inner">
|
||||
<input type="checkbox" id="temp_checkbox_000${item.id}" name="temp_checkbox_000${item.id}" value="${item.id}">
|
||||
<input type="checkbox" id="removeIds_${item.id}" name="removeIds" value="${item.id}">
|
||||
</label>
|
||||
</div>
|
||||
</td>
|
||||
@@ -93,6 +93,37 @@
|
||||
'json'
|
||||
);
|
||||
}
|
||||
|
||||
// 임가방문정보 삭제
|
||||
const goDeleteVisitInfo = () => {
|
||||
const infoIds = $('input[name=removeIds]:checked');
|
||||
if(infoIds.length <= 0) {
|
||||
alert("임가방문정보를 선택해주세요.");
|
||||
return
|
||||
}
|
||||
|
||||
if(confirm("선택하신 내용을 삭제하시겠습니까? 삭제한 항목은 복구할 수 없습니다.")) {
|
||||
const f = document.reqForm;
|
||||
let dataOj = $(f).serializeObject();
|
||||
|
||||
console.log("dataOj", dataOj);
|
||||
|
||||
ajaxUtil._ajaxMethod(
|
||||
'/api/visitInfo/remove',
|
||||
JSON.stringify(dataOj),
|
||||
(response) => { // 성공
|
||||
alert("방문정보가 삭제되었습니다.");
|
||||
getVisitInfo(0);
|
||||
},
|
||||
function (code, rstData) {
|
||||
if(code == 422) alert(rstData.responseText);
|
||||
},
|
||||
'delete',
|
||||
'json',
|
||||
{ handle422Type: 'alert' }
|
||||
);
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</div>
|
||||
</html>
|
||||
@@ -178,6 +178,10 @@
|
||||
</section>
|
||||
|
||||
<section layout:fragment="script">
|
||||
<script th:inline="javascript">
|
||||
const householdSeq = document.reqForm.householdSeq.value;
|
||||
</script>
|
||||
|
||||
<script>
|
||||
// 일계부 완료상태
|
||||
const statusInfoMap = {
|
||||
|
||||
Reference in New Issue
Block a user