경력현황 재징중 계산 식 변경.

견문통계 오류 수정.

src/main/java/com/dbnt/faisp/main/userInfo/service/PoliceService.java

@@ -13,6 +13,7 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.List;
@@ -30,8 +31,10 @@ public class PoliceService {
   public void saveCareer(UserCareer career) {
     UserCareer lastCareer = userCareerRepository.findTop1ByUserSeqOrderByCareerSeqDesc(career.getUserSeq()).orElse(null);
     career.setCareerSeq(lastCareer==null?1:(lastCareer.getCareerSeq()+1));
-    career.setWorkMonth((int) ChronoUnit.MONTHS.between(career.getStartDate(), career.getEndDate()));
+    if(!career.getInOfficeYn().equals("Y")){
-    career.setWorkDay((int) ChronoUnit.DAYS.between(career.getStartDate(), career.getEndDate()));
+      career.setWorkMonth((int) ChronoUnit.MONTHS.between(career.getStartDate(), career.getEndDate()));
+      career.setWorkDay((int) ChronoUnit.DAYS.between(career.getStartDate(), career.getEndDate()));
+    }
     userCareerRepository.save(career);
   }
 
@@ -45,7 +48,15 @@ public class PoliceService {
   }
 
   public List<UserCareer> selectCareerList(Integer userSeq) {
-    return userCareerRepository.findByUserSeqOrderByStartDateDesc(userSeq);
+    List<UserCareer> careerList = userCareerRepository.findByUserSeqOrderByStartDateDesc(userSeq);
+    for(UserCareer career: careerList){
+      if(career.getEndDate()==null){
+        career.setEndDate(LocalDate.now());
+        career.setWorkMonth((int) ChronoUnit.MONTHS.between(career.getStartDate(), career.getEndDate()));
+        career.setWorkDay((int) ChronoUnit.DAYS.between(career.getStartDate(), career.getEndDate()));
+      }
+    }
+    return careerList;
   }
 
   public void deleteCareer(UserCareer career) {

src/main/resources/mybatisMapper/UserInfoMapper.xml

@@ -144,7 +144,13 @@
              sum(case when career_cd = 'CRC005' then work_month else 0 end) as crc005Sum,
              sum(case when career_cd = 'CRC006' then work_month else 0 end) as crc006Sum,
              max(wrt_dt) as lastCareerWrtDt
-      from user_career
+      from (
+        select user_seq,
+               career_seq,
+               career_cd,
+               coalesce(work_month, (EXTRACT(YEAR FROM AGE(now()::date, start_date)) * 12 + EXTRACT(MONTH FROM AGE(now()::date, start_date)))) as work_month,
+               wrt_dt
+        from user_career ) aa
       group by user_seq
     ) b on a.user_seq = b.user_seq
     <include refid="selectPoliceListWhere"></include>

src/main/resources/static/js/igActivities/fpiMgt/affair/statistics.js

@@ -23,7 +23,7 @@ $(document).on('click', '#fieldTab', function (){
 })
 
 function goFieldStatistics(){
-	searchFade("in");
+	
 	const formData = new FormData($("#searchFm")[0]);
   $.ajax({
     url: '/affair/fieldStatistics',
@@ -36,10 +36,10 @@ function goFieldStatistics(){
       $("#statisticsBody").empty().append(html)
       $("#statisticsBody").show();
       $(".statisticsMenu").hide();
-      searchFade("out");
+      
     },
     error:function(e){
-      searchFade("out");
+      
       ajaxErrorAction(e);
     }
   });
@@ -61,7 +61,7 @@ $(document).on('click', '#ratingTab', function (){
 })
 
 function goRatingStatistics(){
-	searchFade("in");
+	
 	const formData = new FormData($("#searchFm")[0]);
   $.ajax({
     url: '/affair/ratingStatistics',
@@ -74,10 +74,10 @@ function goRatingStatistics(){
       $("#statisticsBody").empty().append(html)
       $("#statisticsBody").show();
       $(".statisticsMenu").hide();
-      searchFade("out");
+      
     },
     error:function(e){
-      searchFade("out");
+      
       ajaxErrorAction(e);
     }
   });

src/main/resources/static/js/police/careerMgt.js

@@ -208,28 +208,18 @@ function checkValue(){
 }
 
 $(document).on('change', '#inOfficeYn', function (){
-	const today = new Date();
+  if($("#startDate").val() == ""){
-	const year = today.getFullYear();
+    alert("근무시작일을 입력해주세요");
-	const month = ('0' + (today.getMonth() + 1)).slice(-2);
+    $('#startDate').focus();
-	const day = ('0' + today.getDate()).slice(-2);
+    this.checked = false;
-	const dateString = year + '-' + month  + '-' + day;
+  }
-	if($("#startDate").val() == ""){
-		alert("근무시작일을 입력해주세요");
-		$('#startDate').focus();
-		this.checked = false;
-	}
-	
-	if(this.checked){
-      $(this).attr('value', 'Y');
-      $("#endDate").val(dateString);
-	  $("#endDate").attr("disabled",true);
-    }else{
-      $(this).attr('value', 'N');
-      $("#endDate").val('');
-	  $("#endDate").removeAttr("disabled");
-    }
-	console.log($("#inOfficeYn").val());
-	
-	
 
+  $("#endDate").val('');
+  if(this.checked){
+    $(this).attr('value', 'Y');
+    $("#endDate").attr("disabled",true);
+  }else{
+    $(this).attr('value', 'N');
+    $("#endDate").removeAttr("disabled");
+  }
 })

src/main/resources/templates/police/career/careerModal.html

@@ -69,7 +69,7 @@
                     </th:block>
                   </th:block>
                   <td th:text="${#temporals.format(career.startDate, 'yyyy-MM-dd')}"></td>
-                  <td th:text="${#temporals.format(career.endDate, 'yyyy-MM-dd')}"></td>
+                  <td th:text="${career.inOfficeYn eq 'Y'?'재직중':#temporals.format(career.endDate, 'yyyy-MM-dd')}"></td>
                   <td th:text="${career.workDay}"></td>
                   <td th:text="${career.workMonth}"></td>
                   <td>