Merge remote-tracking branch 'remotes/origin/dev_party_mange'

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberPointDTO.java

@@ -84,7 +84,7 @@ public class IcPartyMemberPointDTO implements Serializable {
     /**
      * 总分
      */
-	private Integer totalScore;
+	private Integer totalScore = 0;
 
     /**
      * 删除标识：0.未删除 1.已删除

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java

@@ -23,6 +23,7 @@ import com.epmet.modules.partymember.entity.IcPartyMemberEntity;
 import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO;
 import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO;
+import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeSubDTO;
 import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -220,7 +221,12 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl<IcPartyOrgDao, IcPart
         result.setValue(staffInfo.getAgencyId());
 //        result.setOrgPids(staffInfo.getAgencyPIds());
         result.setLabel(staffInfo.getAgencyName());
-        result.setChildren(baseDao.selectAllBranchByAgencyId(staffInfo.getAgencyId(),tokenDto.getCustomerId()));
+        //该行政组织下的所有类型为支部的党组织
+        List<BranchlistTreeSubDTO> orgList = baseDao.selectAllBranchByAgencyId(staffInfo.getAgencyId(),tokenDto.getCustomerId());
+        if(CollectionUtils.isEmpty(orgList)){
+            return new Result<List<BranchlistTreeDTO>>().ok(resultList);
+        }
+        result.setChildren(orgList);
         resultList.add(result);
         return new Result<List<BranchlistTreeDTO>>().ok(resultList);
     }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java

@@ -42,4 +42,9 @@ public interface IcPartyMemberPointDao extends BaseDao<IcPartyMemberPointEntity>
                                                     @Param("customerId") String customerId);
 
     void updateMember(@Param("partyMemberId") String partyMemberId, @Param("totalScore") Integer totalScore);
+
+    int getPoint(@Param("year") String year,
+                     @Param("quarter") String quarter,
+                     @Param("customerId") String customerId,
+                     @Param("partyMemberId") String partyMemberId);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java

@@ -83,14 +83,27 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl<IcPartyMember
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(IcPartyMemberPointDTO dto) {
+        if (dto.getBasePoint() == null) {
+            dto.setBasePoint(NumConstant.ZERO);
+        }
+        if (dto.getReviewPoint() == null) {
+            dto.setReviewPoint(NumConstant.ZERO);
+        }
+        if (dto.getInspirePoint() == null) {
+            dto.setInspirePoint(NumConstant.ZERO);
+        }
         dto.setTotalScore(dto.getBasePoint() + dto.getInspirePoint() + dto.getReviewPoint());
+        if (dto.getWarnPoint() != null) {
             if (dto.getWarnPoint() > 0) {
                 dto.setTotalScore(dto.getTotalScore() - dto.getWarnPoint());
             } else {
                 dto.setTotalScore(dto.getTotalScore() + dto.getWarnPoint());
             }
+        } else {
+            dto.setWarnPoint(NumConstant.ZERO);
+        }
         IcPartyMemberPointEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyMemberPointEntity.class);
-        if(dto.getYear().equals(Year.now().toString())){
+        if (dto.getYear().equals(Year.now().toString())) {
             baseDao.updateMember(dto.getPartyMemberId(), dto.getTotalScore());
         }
         insert(entity);
@@ -99,17 +112,35 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl<IcPartyMember
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(IcPartyMemberPointDTO dto) {
+        if (baseDao.getPoint(dto.getYear(), dto.getQuarter(), dto.getCustomerId(), dto.getPartyMemberId()) != NumConstant.ZERO) {
+            if (dto.getBasePoint() == null) {
+                dto.setBasePoint(NumConstant.ZERO);
+            }
+            if (dto.getReviewPoint() == null) {
+                dto.setReviewPoint(NumConstant.ZERO);
+            }
+            if (dto.getInspirePoint() == null) {
+                dto.setInspirePoint(NumConstant.ZERO);
+            }
             dto.setTotalScore(dto.getBasePoint() + dto.getInspirePoint() + dto.getReviewPoint());
+            if (dto.getWarnPoint() != null) {
                 if (dto.getWarnPoint() > 0) {
                     dto.setTotalScore(dto.getTotalScore() - dto.getWarnPoint());
                 } else {
                     dto.setTotalScore(dto.getTotalScore() + dto.getWarnPoint());
                 }
+            } else {
+                dto.setWarnPoint(NumConstant.ZERO);
+            }
             IcPartyMemberPointEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyMemberPointEntity.class);
-        if(dto.getYear().equals(Year.now().toString())){
+            if (dto.getYear().equals(Year.now().toString())) {
                 baseDao.updateMember(dto.getPartyMemberId(), dto.getTotalScore());
             }
             updateById(entity);
+        } else {
+            save(dto);
+        }
+
     }
 
     @Override

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml

@@ -154,6 +154,18 @@
         a.total_score ASC,
         a.CREATED_TIME
     </select>
+    <select id="getPoint" resultType="java.lang.Integer">
+        SELECT
+            count(id)
+        FROM
+            ic_party_member_point
+        WHERE
+            PARTY_MEMBER_ID = #{partyMemberId}
+            AND CUSTOMER_ID = #{customerId}
+            AND YEAR = #{year}
+            AND QUARTER = #{quarter}
+            AND del_flag = '0'
+    </select>
 
 
 </mapper>