Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_resi_export

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormDao.java

@@ -47,7 +47,7 @@ public interface IcFormDao extends BaseDao<IcFormEntity> {
      */
     CustomerFormResultDTO selectByCode(@Param("customerId") String customerId, @Param("formCode") String formCode);
 
-    List<FormItemResult> selectItemList(@Param("formId") String formId, @Param("dynamic") Boolean dynamic);
+    List<FormItemResult> selectItemList(@Param("itemGroupId")String itemGroupId,@Param("formId") String formId, @Param("dynamic") Boolean dynamic);
 
     List<FormItemResult> selectItemListByGroupId(String groupId);
     List<OptionDTO> selectListOption(String itemId);

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemOptionsDao.java

@@ -41,4 +41,5 @@ public interface IcFormItemOptionsDao extends BaseDao<IcFormItemOptionsEntity> {
      */
     List<String> volunteerLabelByValues(@Param("volunteers") List<String> volunteers,@Param("customerId")String customerId);
 
+    int deleteByItemId(@Param("itemId") String itemId, @Param("customerId") String customerId);
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java

@@ -27,6 +27,7 @@ import com.epmet.dto.form.CustomerFormQueryDTO;
 import com.epmet.dto.form.EditIFormItemFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IcFormItemEntity;
+import com.epmet.entity.IcFormItemOptionsEntity;
 import com.epmet.service.IcFormItemService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -187,17 +188,24 @@ public class IcFormItemServiceImpl extends BaseServiceImpl<IcFormItemDao, IcForm
             entity.setItemType(formDTO.getItemType());
             baseDao.updateById(entity);
             if (!CollectionUtils.isEmpty(formDTO.getOptions())) {
-                //todo
+                icFormItemOptionsDao.deleteByItemId(entity.getId(), entity.getCustomerId());
-                // 先删除后新增
+                int sort = 1;
-                /*int sort=1;
                 for (OptionDTO optionDTO : formDTO.getOptions()) {
                     IcFormItemOptionsEntity optionsEntity = new IcFormItemOptionsEntity();
-                    optionsEntity.setCustomerId();
+                    optionsEntity.setCustomerId(entity.getCustomerId());
-
+                    optionsEntity.setFormCode(entity.getFormCode());
-                }*/
+                    optionsEntity.setFormId(entity.getFormId());
+                    optionsEntity.setItemId(entity.getId());
+                    optionsEntity.setOptionLabel(optionDTO.getLabel());
+                    optionsEntity.setOptionValue(optionDTO.getValue());
+                    optionsEntity.setSort(sort);
+                    icFormItemOptionsDao.insert(optionsEntity);
+                    sort++;
+                }
             }
-
         }
-
     }
+
+
+
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java

@@ -99,7 +99,8 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
         if (null == resultDTO) {
             throw new RenException(EpmetErrorCode.CUSTOMER_FORM_NOT_EXITS.getCode(), EpmetErrorCode.CUSTOMER_FORM_NOT_EXITS.getMsg());
         }
-        List<FormItemResult> itemList = baseDao.selectItemList(resultDTO.getFormId(), formDto.getDynamic());
+        String itemGroupId=formDto.getCustomerId().concat(StrConstant.UNDER_LINE).concat(NumConstant.ZERO_STR);
+        List<FormItemResult> itemList = baseDao.selectItemList(itemGroupId,resultDTO.getFormId(), formDto.getDynamic());
         List<FormGroupDTO> groupList = baseDao.selectListGroup(resultDTO.getFormId());
         resultDTO.setItemList(itemList);
         resultDTO.setGroupList(groupList);

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml

@@ -111,7 +111,7 @@
           <if test="dynamic != null">
             AND fi.DYNAMIC = #{dynamic}
           </if>
-          AND fi.ITEM_GROUP_ID = '0'
+          AND fi.ITEM_GROUP_ID = #{itemGroupId}
         ORDER BY
             fi.SORT ASC
     </select>

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemOptionsDao.xml

@@ -16,4 +16,11 @@
               </foreach>
             )
     </select>
+
+    <delete id="deleteByItemId" parameterType="map">
+       delete from ic_form_item_options
+       where DEL_FLAG = 0
+       and ITEM_ID = #{itemId}
+       AND CUSTOMER_ID = #{customerId}
+    </delete>
 </mapper>